diff --git a/Gemfile b/Gemfile
index 4ee3daa8..6736b8ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem 'base32'
 gem 'coveralls', require: false
 gem 'sanitize'
 gem 'will_paginate'
+gem 'gandi'
 
 platform :mri, :rbx do
   gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic
diff --git a/Gemfile.lock b/Gemfile.lock
index a07b695a..49ec216f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,8 +64,11 @@ GEM
       ffi (>= 1.0.0)
       rake
     filesize (0.1.1)
+    gandi (2.1.3)
+      hashie
     geoip (1.6.1)
     hashdiff (0.2.3)
+    hashie (3.4.3)
     highline (1.7.8)
     hiredis (0.6.1)
     http-cookie (1.0.2)
@@ -239,6 +242,7 @@ DEPENDENCIES
   fabrication
   faker
   filesize
+  gandi
   geoip
   hiredis
   io-extra
diff --git a/environment.rb b/environment.rb
index d8a6cb9d..2314638b 100644
--- a/environment.rb
+++ b/environment.rb
@@ -140,3 +140,7 @@ $country_codes = {}
 CSV.foreach("./files/country_codes.csv") do |row|
   $country_codes[row.last] = row.first
 end
+
+gandi_opts = {}
+gandi_opts[:env] = :test unless ENV['RACK_ENV'] == 'production'
+$gandi = Gandi::Session.new $config['gandi_api_key'], gandi_opts