diff --git a/app/initializers/location.coffee b/app/initializers/location.coffee
new file mode 100644
index 00000000..1177e5dd
--- /dev/null
+++ b/app/initializers/location.coffee
@@ -0,0 +1,11 @@
+`import TravisLocation from 'travis/utils/location'`
+
+initialize = (container, application) ->
+  application.register 'location:travis', TravisLocation
+
+Initializer =
+  name: 'location'
+  initialize: initialize
+
+`export { initialize }`
+`export default Initializer`
diff --git a/app/router.coffee b/app/router.coffee
index 938e571b..e57388a1 100644
--- a/app/router.coffee
+++ b/app/router.coffee
@@ -4,7 +4,7 @@
 
 Router = Ember.Router.extend
   # TODO: we should use TravisLocation here
-  location: if Ember.testing then 'none' else 'history'
+  location: if Ember.testing then 'none' else 'travis'
 
   handleURL: (url) ->
     url = url.replace(/#.*?$/, '')