diff --git a/ui/app/routes/application.js b/ui/app/routes/application.js
index 7728d25f2..0a2e57c39 100644
--- a/ui/app/routes/application.js
+++ b/ui/app/routes/application.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
 
-const { Route } = Ember;
+const { Route, inject } = Ember;
 
 export default Route.extend({
+  config: inject.service(),
+
   resetController(controller, isExiting) {
     if (isExiting) {
       controller.set('error', null);
@@ -11,7 +13,9 @@ export default Route.extend({
 
   actions: {
     didTransition() {
-      window.scrollTo(0, 0);
+      if (!this.get('config.isTest')) {
+        window.scrollTo(0, 0);
+      }
     },
 
     willTransition() {
diff --git a/ui/app/services/config.js b/ui/app/services/config.js
index a6f392a17..2c586d97c 100644
--- a/ui/app/services/config.js
+++ b/ui/app/services/config.js
@@ -10,4 +10,5 @@ export default Service.extend({
 
   isDev: computed.equal('environment', 'development'),
   isProd: computed.equal('environment', 'production'),
+  isTest: computed.equal('environment', 'test'),
 });