diff --git a/cms/envs/common.py b/cms/envs/common.py
index fc721ca820..ddaeaa66b3 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -157,7 +157,7 @@ PIPELINE_CSS = {
 
 PIPELINE_ALWAYS_RECOMPILE = ['sass/base-style.scss']
 
-from x_module import XModuleDescriptor
+from xmodule.x_module import XModuleDescriptor
 js_file_dir = PROJECT_ROOT / "static" / "coffee" / "module"
 try:
     os.makedirs(js_file_dir)
diff --git a/rakefile b/rakefile
index b6fbb18ac6..e76e200777 100644
--- a/rakefile
+++ b/rakefile
@@ -39,7 +39,7 @@ def django_admin(system, env, command, *args)
     return "#{django_admin} #{command} --settings=#{system}.envs.#{env} --pythonpath=. #{args.join(' ')}"
 end
 
-task :default => [:pep8, :pylint, :test]
+task :default => [:test, :pep8, :pylint]
 
 directory REPORT_DIR
 directory LMS_REPORT_DIR