diff --git a/test/integration/locale_test.rb b/test/integration/locale_test.rb
new file mode 100644
index 00000000..084f88fd
--- /dev/null
+++ b/test/integration/locale_test.rb
@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class LocaleTest < ActionDispatch::IntegrationTest
+
+  fixtures :users
+
+  def test_locale_index
+    logs_in_as(users(:other_user_email), 'open')
+    @user = User.find(@request.session['user_id'])
+    locales = I18n.available_locales.map {|l| l.to_s}
+    locales.each do |locale|
+      # Set the locale
+      @user.preference.locale = locale
+      @user.preference.save!
+      logs_in_as(users(:other_user_email), 'open')
+      get '/'
+      assert_response :success
+      assert_template "todos/index"
+    end
+  end
+
+end
diff --git a/test/integration/recurring_todos_test.rb b/test/integration/recurring_todos_test.rb
index 1f461e51..c12738b8 100644
--- a/test/integration/recurring_todos_test.rb
+++ b/test/integration/recurring_todos_test.rb
@@ -2,17 +2,6 @@ require 'test_helper'
 
 class RecurringTodosTest < ActionDispatch::IntegrationTest
 
-  def logs_in_as(user,plain_pass)
-    @user = user
-    post "/login", params: { :user_login => @user.login,
-      :user_password => plain_pass,
-      :user_noexpiry => 'n' }
-    assert_response :redirect
-    follow_redirect!
-    assert_response :success
-    assert_template "todos/index"
-  end
-
   def test_deleting_recurring_todo_clears_reference_from_related_todos
     logs_in_as(users(:admin_user), 'abracadabra')
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 70c26275..391c5cc7 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -109,6 +109,17 @@ end
 
 class ActionDispatch::IntegrationTest
 
+  def logs_in_as(user, plain_pass)
+    @user = user
+    post "/login", params: { :user_login => @user.login,
+      :user_password => plain_pass,
+      :user_noexpiry => 'n' }
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template "todos/index"
+  end
+
   def authenticated_post_xml(url, username, password, parameters, headers = {})
     post url, params: parameters, headers:
         { 'HTTP_AUTHORIZATION' => "Basic " + Base64.encode64("#{username}:#{password}"),