diff --git a/envs/test.py b/envs/test.py
index 9aa030c15a6fbcf1215ca56c8a3c211f0038ec38..80d5deeeb3f2206582c230e2e40c0a623adc3e32 100644
--- a/envs/test.py
+++ b/envs/test.py
@@ -25,7 +25,8 @@ for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Local Directories
-COURSES_ROOT = PROJECT_ROOT / "test_data"
+TEST_ROOT = path("test_root")
+COURSES_ROOT = TEST_ROOT / "data"
 DATA_DIR = COURSES_ROOT
 MAKO_TEMPLATES['course'] = [DATA_DIR]
 MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections']
@@ -34,7 +35,7 @@ MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates',
                           DATA_DIR / 'info',
                           DATA_DIR / 'problems']
 
-LOGGING = logsettings.get_logger_config(PROJECT_ROOT / "log", 
+LOGGING = logsettings.get_logger_config(TEST_ROOT / "log", 
                                         logging_env="dev",
                                         tracking_filename="tracking.log",
                                         debug=True)
diff --git a/test_data/course_settings.py b/test_root/data/course_settings.py
similarity index 100%
rename from test_data/course_settings.py
rename to test_root/data/course_settings.py
diff --git a/test_data/custom_tags/.git-keep b/test_root/data/custom_tags/.git-keep
similarity index 100%
rename from test_data/custom_tags/.git-keep
rename to test_root/data/custom_tags/.git-keep
diff --git a/test_root/log/.git-keep b/test_root/log/.git-keep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391