diff --git a/tests/authtokens.test b/tests/authtokens.test
index faa521ba..4f52c1ec 100644
--- a/tests/authtokens.test
+++ b/tests/authtokens.test
@@ -6,7 +6,7 @@
  */
 
 /**
- *
+ * Auth token tests.
  */
 class IslandoraAuthtokensTestCase extends IslandoraWebTestCase {
 
@@ -21,13 +21,6 @@ class IslandoraAuthtokensTestCase extends IslandoraWebTestCase {
     );
   }
 
-  /**
-   * Set up data for the tests.
-   */
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Test redeeming invalid tokens.
    */
diff --git a/tests/derivatives.test b/tests/derivatives.test
index 89cc9c16..3d6bac34 100644
--- a/tests/derivatives.test
+++ b/tests/derivatives.test
@@ -96,8 +96,8 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
     global $_islandora_derivative_test_ingest_method;
     $_islandora_derivative_test_ingest_method = 'ingestDatastream';
     $object = $this->constructBaseObject();
-    $object = $this->constructDERIVDatastream($object);
-    $this->constructNOSOURCEDatastream($object);
+    $object = $this->constructDerivDatastream($object);
+    $this->constructNoSourceDatastream($object);
     $islandora_object = islandora_object_load($this->pid);
     islandora_do_derivatives($islandora_object, array(
       'force' => TRUE,
@@ -128,7 +128,7 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
     global $_islandora_derivative_test_ingest_method;
     $_islandora_derivative_test_ingest_method = 'ingestDatastream';
     $object = $this->constructBaseObject();
-    $this->constructDERIVDatastream($object);
+    $this->constructDerivDatastream($object);
     // Need to do this as Tuque caches.
     $connection = islandora_get_tuque_connection();
     $connection->cache->resetCache();
@@ -159,11 +159,11 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
   /**
    * Tests derivative hook filtering based upon source_dsid.
    */
-  public function testDerivativeFilteringOnSourceDSID() {
+  public function testDerivativeFilteringOnSourceDsid() {
     global $_islandora_derivative_test_derivative_functions;
     $_islandora_derivative_test_derivative_functions = array();
     $object = $this->constructBaseObject();
-    $this->constructSOMEWEIRDDATASTREAMDatastream($object);
+    $this->constructSomeWeirdDatastream($object);
     $object = islandora_object_load($this->pid);
     islandora_do_derivatives($object, array(
       'source_dsid' => 'OBJ',
@@ -185,7 +185,7 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
   /**
    * Tests that only functions were the source_dsid is NULL are fired.
    */
-  public function testNULLSourceDSID() {
+  public function testNullSourceDsid() {
     global $_islandora_derivative_test_derivative_functions;
     $_islandora_derivative_test_derivative_functions = array();
     $this->constructBaseObject();
@@ -212,7 +212,7 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
     global $_islandora_derivative_test_derivative_functions;
     $_islandora_derivative_test_derivative_functions = array();
     $object = $this->constructBaseObject();
-    $object = $this->constructSOMEWEIRDDATASTREAMDatastream($object);
+    $object = $this->constructSomeWeirdDatastream($object);
     $object = islandora_object_load($this->pid);
     islandora_do_derivatives($object, array());
     $this->assertDatastreams($object, array(
@@ -230,11 +230,11 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
   /**
    * Tests that when no source_dsid all derivative functions are called.
    */
-  public function testNoSourceDSIDForce() {
+  public function testNoSourceDsidForce() {
     global $_islandora_derivative_test_derivative_functions;
     $_islandora_derivative_test_derivative_functions = array();
     $object = $this->constructBaseObject();
-    $this->constructSOMEWEIRDDATASTREAMDatastream($object);
+    $this->constructSomeWeirdDatastream($object);
     $object = islandora_object_load($this->pid);
     islandora_do_derivatives($object, array(
       'force' => TRUE,
@@ -293,7 +293,7 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
    * @return AbstractObject
    *   The modified AbstractObject.
    */
-  public function constructDERIVDatastream(AbstractObject $object) {
+  public function constructDerivDatastream(AbstractObject $object) {
     $dsid = 'DERIV';
     $ds = $object->constructDatastream($dsid);
     $ds->label = 'Test';
@@ -311,7 +311,7 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
    * @return AbstractObject
    *   The modified AbstractObject.
    */
-  public function constructNOSOURCEDatastream(AbstractObject $object) {
+  public function constructNoSourceDatastream(AbstractObject $object) {
     $dsid = 'NOSOURCE';
     $ds = $object->constructDatastream($dsid);
     $ds->label = 'Test';
@@ -329,7 +329,7 @@ class IslandoraDerivativesTestCase extends IslandoraWebTestCase {
    * @return AbstractObject
    *   The modified AbstractObject.
    */
-  public function constructSOMEWEIRDDATASTREAMDatastream(AbstractObject $object) {
+  public function constructSomeWeirdDatastream(AbstractObject $object) {
     $dsid = 'SOMEWEIRDDATASTREAM';
     $ds = $object->constructDatastream($dsid);
     $ds->label = 'Test';
diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh
index e5d3731e..4e9c2152 100755
--- a/tests/scripts/travis_setup.sh
+++ b/tests/scripts/travis_setup.sh
@@ -61,6 +61,7 @@ elif [ -f "$HOME/.composer/vendor/bin/phpcs" ]; then
   sudo ln -s $HOME/.composer/vendor/bin/phpcs /usr/bin/phpcs
 else
   echo "Did not find phpcs"
+  exit 1
 fi
 
 # PHP Copy-Paste Detection installation.
@@ -71,6 +72,7 @@ elif [ -f "$HOME/.composer/vendor/bin/phpcpd" ]; then
   sudo ln -s $HOME/.composer/vendor/bin/phpcpd /usr/local/bin/phpcpd
 else
   echo "Did not find phpcpd"
+  exit 1
 fi
 
 # Drupal installation.