diff --git a/.travis.yml b/.travis.yml
index 0c5fe32a..d95cfb54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,5 @@ before_install:
 script:
   - ant -buildfile sites/all/modules/islandora/build.xml lint
   - drush dcs sites/all/modules/islandora
+  - phpcpd sites/all/modules/islandora
   - drush test-run --uri=http://localhost:8081 Islandora
diff --git a/tests/islandora_test.info b/tests/islandora_test.info
deleted file mode 100644
index c6cb57ad..00000000
--- a/tests/islandora_test.info
+++ /dev/null
@@ -1,6 +0,0 @@
-name = Islandora Test Module
-description = Tests Hooks. Do not enable.
-core = 7.x
-package = Testing
-hidden = TRUE
-dependencies[] = islandora
diff --git a/tests/islandora_test.module b/tests/islandora_test.module
deleted file mode 100644
index 315b88ee..00000000
--- a/tests/islandora_test.module
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * @file
- * Implements hooks that get tested by islandora_hooks.test
- */
-
-/**
- * Implements hook_islandora_object_alter().
- */
-function islandora_hooks_test_islandora_object_alter(AbstractFedoraObject $object, array &$context) {
-  switch ($context['action']) {
-    case 'ingest':
-      if ($object->id == 'test:testIngestedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_INGESTED_HOOK] = TRUE;
-        if ($object->label == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      break;
-
-    case 'modify':
-      if ($object->id == 'test:testModifiedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_MODIFIED_HOOK] = TRUE;
-        if (isset($context['params']['label']) && $context['params']['label'] == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      elseif ($object->id == 'test:testPurgedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_PURGED_HOOK] = TRUE;
-        if (isset($context['params']['label']) && $context['params']['label'] == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif (isset($context['params']['label']) && $context['params']['label'] == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-
-    case 'purge':
-      if ($object->id == 'test:testPurgedObjectHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_OBJECT_PURGED_HOOK] = TRUE;
-        if ($object->label == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif ($object->label == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-  }
-}
-
-/**
- * Implements hook_islandora_object_alter().
- */
-function islandora_hooks_test_islandora_datastream_alter(AbstractFedoraObject $object, AbstractFedoraDatastream $datastream, array &$context) {
-  switch ($context['action']) {
-    case 'ingest':
-      if ($object->id == 'test:testIngestedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_INGESTED_HOOK] = TRUE;
-        if ($datastream->label == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      break;
-
-    case 'modify':
-      if ($object->id == 'test:testModifiedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_MODIFIED_HOOK] = TRUE;
-        if (isset($context['params']['dsLabel']) && $context['params']['dsLabel'] == 'block') {
-          $context['block'] = TRUE;
-        }
-      }
-      elseif ($object->id == 'test:testPurgedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_PURGED_HOOK] = TRUE;
-        if (isset($context['params']['dsLabel']) && $context['params']['dsLabel'] == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif (isset($context['params']['dsLabel']) && $context['params']['dsLabel'] == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-
-    case 'purge':
-      if ($object->id == 'test:testPurgedDatastreamHook') {
-        $_SESSION['islandora_hooks']['alter'][ISLANDORA_DATASTREAM_PURGED_HOOK] = TRUE;
-        if ($datastream->label == 'block') {
-          $context['block'] = TRUE;
-        }
-        elseif ($datastream->label == 'delete') {
-          $context['delete'] = TRUE;
-        }
-      }
-      break;
-  }
-}
-
-/**
- * Implements hook_islandora_object_ingested().
- */
-function islandora_hooks_test_islandora_object_ingested(FedoraObject $object) {
-  if ($object->id == 'test:testIngestedObjectHook') {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_OBJECT_INGESTED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_object_modified().
- */
-function islandora_hooks_test_islandora_object_modified(FedoraObject $object) {
-  if ($object->id == 'test:testModifiedObjectHook') {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_OBJECT_MODIFIED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_object_purged().
- */
-function islandora_hooks_test_islandora_object_purged($pid) {
-  if ($pid == 'test:testPurgedObjectHook') {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_OBJECT_PURGED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_datastream_ingested().
- */
-function islandora_hooks_test_islandora_datastream_ingested(FedoraObject $object, FedoraDatastream $datastream) {
-  if ($object->id == 'test:testIngestedDatastreamHook' && $datastream->id == "TEST") {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_DATASTREAM_INGESTED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_datastream_modified().
- */
-function islandora_hooks_test_islandora_datastream_modified(FedoraObject $object, FedoraDatastream $datastream) {
-  if ($object->id == 'test:testModifiedDatastreamHook' && $datastream->id == "TEST") {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_DATASTREAM_MODIFIED_HOOK] = TRUE;
-  }
-}
-
-/**
- * Implements hook_islandora_datastream_purged().
- */
-function islandora_hooks_test_islandora_datastream_purged(FedoraObject $object, $dsid) {
-  if ($object->id == 'test:testPurgedDatastreamHook' && $dsid == "TEST") {
-    $_SESSION['islandora_hooks']['hook'][ISLANDORA_DATASTREAM_PURGED_HOOK] = TRUE;
-  }
-}