diff --git a/lms/envs/common.py b/lms/envs/common.py
index 16472795e0..a2d9614109 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -266,24 +266,6 @@ STATICFILES_DIRS = [
     COMMON_ROOT / "static",
     PROJECT_ROOT / "static",
 ]
-if os.path.isdir(DATA_DIR):
-    # Add the full course repo if there is no static directory
-    STATICFILES_DIRS += [
-        # TODO (cpennington): When courses are stored in a database, this
-        # should no longer be added to STATICFILES
-        (course_dir, DATA_DIR / course_dir)
-        for course_dir in os.listdir(DATA_DIR)
-        if (os.path.isdir(DATA_DIR / course_dir) and
-            not os.path.isdir(DATA_DIR / course_dir / 'static'))
-    ]
-    # Otherwise, add only the static directory from the course dir
-    STATICFILES_DIRS += [
-        # TODO (cpennington): When courses are stored in a database, this
-        # should no longer be added to STATICFILES
-        (course_dir, DATA_DIR / course_dir / 'static')
-        for course_dir in os.listdir(DATA_DIR)
-        if (os.path.isdir(DATA_DIR / course_dir / 'static'))
-    ]
 
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -468,7 +450,7 @@ PIPELINE_JS = {
         'source_filenames': sorted(
             set(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/**/*.coffee') +
                 rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/**/*.coffee')) -
-            set(courseware_js + discussion_js + staff_grading_js + peer_grading_js) 
+            set(courseware_js + discussion_js + staff_grading_js + peer_grading_js)
         ) + [
             'js/form.ext.js',
             'js/my_courses_dropdown.js',
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 99ee9662ee..338a31f641 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -106,6 +106,27 @@ VIRTUAL_UNIVERSITIES = []
 
 COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE"
 
+############################## Course static files ##########################
+if os.path.isdir(DATA_DIR):
+    # Add the full course repo if there is no static directory
+    STATICFILES_DIRS += [
+        # TODO (cpennington): When courses are stored in a database, this
+        # should no longer be added to STATICFILES
+        (course_dir, DATA_DIR / course_dir)
+        for course_dir in os.listdir(DATA_DIR)
+        if (os.path.isdir(DATA_DIR / course_dir) and
+            not os.path.isdir(DATA_DIR / course_dir / 'static'))
+    ]
+    # Otherwise, add only the static directory from the course dir
+    STATICFILES_DIRS += [
+        # TODO (cpennington): When courses are stored in a database, this
+        # should no longer be added to STATICFILES
+        (course_dir, DATA_DIR / course_dir / 'static')
+        for course_dir in os.listdir(DATA_DIR)
+        if (os.path.isdir(DATA_DIR / course_dir / 'static'))
+    ]
+
+
 ################################# mitx revision string  #####################
 
 MITX_VERSION_STRING = os.popen('cd %s; git describe' % REPO_ROOT).read().strip()