diff --git a/Rakefile b/Rakefile
index b3944b7f0..10f156149 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ Houndapp::Application.load_tasks
 task(:default).clear
 
 # Run webpack:build before :spec
-task default: ["webpack:build", :spec]
+task default: ["webpack:build", "spec", "js:spec", "bundler:audit"]
 
 task "assets:precompile" => "webpack:build"
 
@@ -18,5 +18,3 @@ if defined? RSpec
     t.verbose = false
   end
 end
-
-task default: "bundler:audit"
diff --git a/circle.yml b/circle.yml
index 9c127ce1c..6bb7cdb6d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,4 +4,4 @@ machine:
 
 test:
   override:
-    - bundle exec rake && npm run test
+    - bundle exec rake
diff --git a/lib/tasks/js.rake b/lib/tasks/js.rake
new file mode 100644
index 000000000..593546bb2
--- /dev/null
+++ b/lib/tasks/js.rake
@@ -0,0 +1,5 @@
+namespace :js do
+  task spec: "webpack:build" do
+    sh "npm run test"
+  end
+end