diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 8c61509e..7fe46587 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -15,6 +15,7 @@
 
 // Stuff in app/assets
 //= require tracks.js
+//= require disable_fx_in_test
 
 // Stuff in vendor/assets
 //= require jquery-ui-1.10.0.custom.min
diff --git a/app/assets/javascripts/disable_fx_in_test.js.erb b/app/assets/javascripts/disable_fx_in_test.js.erb
new file mode 100644
index 00000000..89064c9d
--- /dev/null
+++ b/app/assets/javascripts/disable_fx_in_test.js.erb
@@ -0,0 +1,3 @@
+<% if Rails.env.test? || Rails.env.cucumber? %>
+$.fx.off = true;
+<% end %>