diff --git a/.gitignore b/.gitignore
index a6c24404..85130cb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,13 @@
 *.pyc
 *.sublime*
 *.ropeproject*
+*.swp
 
 config.py
 
 .ropeproject/*
 
 pillar/application/static/storage/
+/build
+/.cache
+/pillar/pillar.egg-info/
diff --git a/pillar/tests/__init__.py b/pillar/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..667732e3
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+"""Setup file for testing, not for packaging/distribution."""
+
+import setuptools
+
+setuptools.setup(
+    name='pillar',
+    version='1.0',
+    packages=setuptools.find_packages('pillar', exclude=['manage']),
+    package_dir={'': 'pillar'},  # tell setuptools packages are under src
+    tests_require=['pytest', 'httpretty'],
+    zip_safe=False,
+)
diff --git a/pillar/tests/test_auth.py b/tests/test_auth.py
similarity index 96%
rename from pillar/tests/test_auth.py
rename to tests/test_auth.py
index fac68417..3eb92f88 100644
--- a/pillar/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -10,7 +10,9 @@ TEST_EMAIL_ADDRESS = '%s@testing.blender.org' % TEST_EMAIL_USER
 
 os.environ['BLENDER_ID_ENDPOINT'] = BLENDER_ID_ENDPOINT
 os.environ['MONGO_DBNAME'] = 'unittest'
-os.environ['EVE_SETTINGS'] = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'settings.py')
+os.environ['EVE_SETTINGS'] = os.path.join(
+    os.path.dirname(os.path.dirname(__file__)),
+    'pillar', 'settings.py')
 
 from application import app
 from application.utils import authentication as auth