diff --git a/Makefile b/Makefile
index 30fbfce..77ab870 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ $(NOSE):
 .PHONY: regression_test
 regression_test:
 	$(PY) src/tests/regression.py
-	$(PY) -m webbrowser src/tests/test_output/index.html
+	$(PY) -m webbrowser src/tests/regression_test_output/index.html
 
 
 # #######
diff --git a/src/tests/helpers.py b/src/tests/helpers.py
index 029c892..8bdcf27 100644
--- a/src/tests/helpers.py
+++ b/src/tests/helpers.py
@@ -2,7 +2,7 @@ import os
 
 
 SAMPLES = os.path.join(os.path.dirname(__file__), 'samples')
-REGRESSION_DATA = os.path.join(os.path.dirname(__file__), 'test_data')
+REGRESSION_DATA = os.path.join(os.path.dirname(__file__), 'regression_test_data')
 
 
 def load_sample(filename):
diff --git a/src/tests/regression.py b/src/tests/regression.py
index ac78396..db2e3af 100644
--- a/src/tests/regression.py
+++ b/src/tests/regression.py
@@ -29,8 +29,8 @@ RESULT_SUFFIX = '-result.html'
 YAML_EXTENSION = '.yaml'
 
 TESTDIR = os.path.dirname(__file__)
-TEST_DATA_PATH = os.path.join(TESTDIR, 'test_data')
-TEST_OUTPUT_PATH = os.path.join(TESTDIR, 'test_output')
+TEST_DATA_PATH = os.path.join(TESTDIR, 'regression_test_data')
+TEST_OUTPUT_PATH = os.path.join(TESTDIR, 'regression_test_output')
 TEST_SUMMARY_PATH = os.path.join(TEST_OUTPUT_PATH, 'index.html')
 
 SUMMARY_CSS = '''