diff --git a/Assetfile b/Assetfile
index 4eccd2fc..8c867331 100644
--- a/Assetfile
+++ b/Assetfile
@@ -31,6 +31,11 @@ input assets.scripts do
   end
 
   match 'vendor/**/*.js' do
+    if assets.production?
+      reject 'ember.js'
+    else
+      reject 'ember.prod.js'
+    end
     safe_concat assets.vendor_order, 'vendor.js'
   end
 
diff --git a/lib/travis/assets.rb b/lib/travis/assets.rb
index b37412c9..8f172e7d 100644
--- a/lib/travis/assets.rb
+++ b/lib/travis/assets.rb
@@ -8,6 +8,7 @@ module Travis
 
     TYPES = [:styles, :scripts, :images, :static, :vendor]
     VENDOR_ORDER = %w(jquery.min minispade handlebars ember)
+    PRODUCTION_VENDOR_ORDER = %w(jquery.min minispade handlebars ember.prod)
     SPEC_VENDOR_ORDER = %w(jasmine jasmine-html jasmine-runner sinon)
 
     attr_reader :roots, :env
@@ -30,7 +31,8 @@ module Travis
     end
 
     def vendor_order
-      VENDOR_ORDER.map { |name| "vendor/#{name}.js" }
+      order = production? ? PRODUCTION_VENDOR_ORDER : VENDOR_ORDER
+      order.map { |name| "vendor/#{name}.js" }
     end
 
     def spec_vendor_order