diff --git a/Makefile b/Makefile
index 2a3a3ae..3613229 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ build:
 
 test: clean build
 		source sandman_env/bin/activate && \
-		coverage run --source=sandman setup.py test && \
+		coverage run --source=test setup.py test && \
 		coverage html && \
 		coverage report
 
diff --git a/sandman/test/__init__.py b/tests/__init__.py
similarity index 100%
rename from sandman/test/__init__.py
rename to tests/__init__.py
diff --git a/sandman/test/data/ChinookDatabase1.4_MySql.zip b/tests/data/ChinookDatabase1.4_MySql.zip
similarity index 100%
rename from sandman/test/data/ChinookDatabase1.4_MySql.zip
rename to tests/data/ChinookDatabase1.4_MySql.zip
diff --git a/sandman/test/data/Chinook_MySql.sql b/tests/data/Chinook_MySql.sql
similarity index 100%
rename from sandman/test/data/Chinook_MySql.sql
rename to tests/data/Chinook_MySql.sql
diff --git a/sandman/test/data/Chinook_MySql_AutoIncrementPKs.sql b/tests/data/Chinook_MySql_AutoIncrementPKs.sql
similarity index 100%
rename from sandman/test/data/Chinook_MySql_AutoIncrementPKs.sql
rename to tests/data/Chinook_MySql_AutoIncrementPKs.sql
diff --git a/sandman/test/data/Chinook_Sqlite.sql b/tests/data/Chinook_Sqlite.sql
similarity index 100%
rename from sandman/test/data/Chinook_Sqlite.sql
rename to tests/data/Chinook_Sqlite.sql
diff --git a/sandman/test/data/Chinook_Sqlite.sqlite b/tests/data/Chinook_Sqlite.sqlite
similarity index 100%
rename from sandman/test/data/Chinook_Sqlite.sqlite
rename to tests/data/Chinook_Sqlite.sqlite
diff --git a/sandman/test/data/Chinook_Sqlite_AutoIncrementPKs.sql b/tests/data/Chinook_Sqlite_AutoIncrementPKs.sql
similarity index 100%
rename from sandman/test/data/Chinook_Sqlite_AutoIncrementPKs.sql
rename to tests/data/Chinook_Sqlite_AutoIncrementPKs.sql
diff --git a/sandman/test/data/Chinook_Sqlite_AutoIncrementPKs.sqlite b/tests/data/Chinook_Sqlite_AutoIncrementPKs.sqlite
similarity index 100%
rename from sandman/test/data/Chinook_Sqlite_AutoIncrementPKs.sqlite
rename to tests/data/Chinook_Sqlite_AutoIncrementPKs.sqlite
diff --git a/sandman/test/data/CreateMySql.bat b/tests/data/CreateMySql.bat
similarity index 100%
rename from sandman/test/data/CreateMySql.bat
rename to tests/data/CreateMySql.bat
diff --git a/sandman/test/data/CreateSqlite.bat b/tests/data/CreateSqlite.bat
similarity index 100%
rename from sandman/test/data/CreateSqlite.bat
rename to tests/data/CreateSqlite.bat
diff --git a/sandman/test/data/chinook b/tests/data/chinook
similarity index 100%
rename from sandman/test/data/chinook
rename to tests/data/chinook
diff --git a/sandman/test/data/foreign_key b/tests/data/foreign_key
similarity index 100%
rename from sandman/test/data/foreign_key
rename to tests/data/foreign_key
diff --git a/sandman/test/foreign_key_models.py b/tests/foreign_key_models.py
similarity index 100%
rename from sandman/test/foreign_key_models.py
rename to tests/foreign_key_models.py
diff --git a/sandman/test/models.py b/tests/models.py
similarity index 100%
rename from sandman/test/models.py
rename to tests/models.py
diff --git a/sandman/test/templates/base.html b/tests/templates/base.html
similarity index 100%
rename from sandman/test/templates/base.html
rename to tests/templates/base.html
diff --git a/sandman/test/templates/resource.html b/tests/templates/resource.html
similarity index 100%
rename from sandman/test/templates/resource.html
rename to tests/templates/resource.html
diff --git a/sandman/test/test_foreign_keys.py b/tests/test_foreign_keys.py
similarity index 91%
rename from sandman/test/test_foreign_keys.py
rename to tests/test_foreign_keys.py
index 35bab6c..448984f 100644
--- a/sandman/test/test_foreign_keys.py
+++ b/tests/test_foreign_keys.py
@@ -10,7 +10,7 @@ class TestSandmanForeignKeysBase(object):
     """Class to test edge-case foreign key conditions, using a database
     explicitly built to contain these cases."""
 
-    DB_LOCATION = os.path.join(os.getcwd(), 'sandman', 'test', 'foreign_key')
+    DB_LOCATION = os.path.join(os.getcwd(), 'tests', 'foreign_key')
 
     def setup_method(self, _):
         """Grab the database file from the *data* directory and configure the
@@ -18,8 +18,7 @@ def setup_method(self, _):
         shutil.copy(
                 os.path.join(
                     os.getcwd(),
-                    'sandman',
-                    'test',
+                    'tests',
                     'data',
                     'foreign_key'),
                 self.DB_LOCATION)
diff --git a/sandman/test/test_foreign_keys.py.bak b/tests/test_foreign_keys.py.bak
similarity index 100%
rename from sandman/test/test_foreign_keys.py.bak
rename to tests/test_foreign_keys.py.bak
diff --git a/sandman/test/test_sandman.py b/tests/test_sandman.py
similarity index 99%
rename from sandman/test/test_sandman.py
rename to tests/test_sandman.py
index 88484ab..544eaa7 100644
--- a/sandman/test/test_sandman.py
+++ b/tests/test_sandman.py
@@ -10,7 +10,7 @@
 class TestSandmanBase(object):
     """Base class for all sandman test classes."""
 
-    DB_LOCATION = os.path.join(os.getcwd(), 'sandman', 'test', 'chinook')
+    DB_LOCATION = os.path.join(os.getcwd(), 'tests', 'chinook')
 
     def setup_method(self, _):
         """Grab the database file from the *data* directory and configure the
@@ -18,8 +18,7 @@ def setup_method(self, _):
         shutil.copy(
                 os.path.join(
                     os.getcwd(),
-                    'sandman',
-                    'test',
+                    'tests',
                     'data',
                     'chinook'),
                 self.DB_LOCATION)