diff --git a/Gemfile b/Gemfile
index 791d7c80..1666d637 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,9 @@ gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 
+# TODO need to release the gem as soon i'm certain this change makes sense
+gem 'simple_states',      github: 'svenfuchs/simple_states', branch: 'sf-set-state-early'
+
 gem 'unicorn'
 gem "sentry-raven",    github: 'getsentry/raven-ruby'
 gem 'yard-sinatra',    github: 'rkh/yard-sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index af4ce8e9..89806344 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,6 +40,15 @@ GIT
     yard-sinatra (1.0.0)
       yard (~> 0.7)
 
+GIT
+  remote: git://github.com/svenfuchs/simple_states.git
+  revision: b1d45144e6a758220d7b21f83b08dc92de0d3196
+  branch: sf-set-state-early
+  specs:
+    simple_states (0.1.1)
+      activesupport
+      hashr (~> 0.0.10)
+
 GIT
   remote: git://github.com/travis-ci/travis-core.git
   revision: 714090635924650998b3a3d0f18b39d9cfd46839
@@ -234,9 +243,6 @@ GEM
       redis (~> 3)
       redis-namespace
     signature (0.1.6)
-    simple_states (0.1.1)
-      activesupport
-      hashr (~> 0.0.10)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -293,6 +299,7 @@ DEPENDENCIES
   rerun
   rspec (~> 2.11)
   sentry-raven!
+  simple_states!
   travis-api!
   travis-core!
   travis-sidekiqs!