diff --git a/.erb-lint.yml b/.erb-lint.yml
index ec457aa0c26..1643ea6f6f4 100644
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -8,6 +8,8 @@ linters:
     enabled: true
   FinalNewline:
     enabled: true
+  NoJavascriptTagHelper:
+    enabled: true
   SelfClosingTag:
     enabled: false
   SpaceAroundErbTag:
diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb
index f034f7baf52..d4c0d4daf0e 100644
--- a/app/views/layouts/_common_head.html.erb
+++ b/app/views/layouts/_common_head.html.erb
@@ -6,4 +6,3 @@
 <%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %>
 <%= csrf_meta_tags %>
 <%= favicon_link_tag "favicon.ico" %>
-<%= render "layouts/disable_animations_in_tests" if Rails.env.test? %>
diff --git a/app/views/layouts/_disable_animations_in_tests.html.erb b/app/views/layouts/_disable_animations_in_tests.html.erb
deleted file mode 100644
index e2df3fe4eb2..00000000000
--- a/app/views/layouts/_disable_animations_in_tests.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= javascript_tag "jQuery.fx.off = true" %>
-<style>
-* {
-  transition: none !important;
-  animation-duration: 0s !important;
-  animation-delay: 0s !important;
-}
-</style>
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 44e369ffab7..29fc2eece42 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -47,5 +47,6 @@
 
 Capybara.exact = true
 Capybara.enable_aria_label = true
+Capybara.disable_animation = true
 
 OmniAuth.config.test_mode = true