diff --git a/lib/ember-cli/middleware.rb b/lib/ember-cli/middleware.rb
index 51ca9546..51c581ce 100644
--- a/lib/ember-cli/middleware.rb
+++ b/lib/ember-cli/middleware.rb
@@ -8,7 +8,11 @@ def call(env)
       enable_ember_cli
       EmberCLI.wait!
 
-      @app.call(env)
+      if env["PATH_INFO"] == "/testem.js"
+        [ 200, { "Content-Type" => "text/javascript" }, [""] ]
+      else
+        @app.call(env)
+      end
     end
 
     private