diff --git a/Gemfile b/Gemfile
index e1c4d656b8..5050213a17 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,6 @@ group :test, :development do
   gem 'rspec-rails'
   gem 'shoulda-matchers'
   gem 'factory_girl_rails', :require => false
-  gem 'faker'
   gem 'capybara'
   gem 'database_cleaner', '0.7.1', :require => false
   gem 'simplecov', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b762b786c..74ffb03923 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -250,8 +250,6 @@ GEM
     factory_girl_rails (3.3.0)
       factory_girl (~> 3.3.0)
       railties (>= 3.0.0)
-    faker (1.0.1)
-      i18n (~> 0.4)
     ffaker (1.15.0)
     ffi (1.9.3)
     fog (1.14.0)
@@ -522,7 +520,6 @@ DEPENDENCIES
   deface!
   eaterprises_feature!
   factory_girl_rails
-  faker
   foreigner
   foundation-icons-sass-rails
   foundation-rails
diff --git a/config/application.rb b/config/application.rb
index 8f0728dd45..f36691ebb5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -63,6 +63,8 @@ module Openfoodnetwork
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.default_locale = 'en'
 
+    I18n.config.enforce_available_locales = true
+
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
diff --git a/spec/factories.rb b/spec/factories.rb
index df1dd4d50c..710ba1c8ba 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,4 +1,4 @@
-require 'faker'
+require 'ffaker'
 require 'spree/core/testing_support/factories'
 
 FactoryGirl.define do