diff --git a/Makefile b/Makefile
index 46c665c..35889e1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ lint:
 	pylint --rcfile=.pylintrc nilmdb
 
 test:
-	python runtests.py
+	python tests/runtests.py
 
 clean::
 	find . -name '*pyc' | xargs rm -f
diff --git a/runtests.py b/tests/runtests.py
similarity index 95%
rename from runtests.py
rename to tests/runtests.py
index 41fc9b5..7cd35c9 100755
--- a/runtests.py
+++ b/tests/runtests.py
@@ -6,6 +6,9 @@ import sys
 import glob
 from collections import OrderedDict
 
+# Change into parent dir
+os.chdir(os.path.dirname(os.path.realpath(__file__)) + "/..")
+
 class JimOrderPlugin(nose.plugins.Plugin):
     """When searching for tests and encountering a directory that
     contains a 'test.order' file, run tests listed in that file, in the