diff --git a/Gemfile b/Gemfile
index ab4154dd..d9fc87d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'coffee-rails', '~>4.0'
 #gem 'json'
 
 # todo: remove xml api
-gem 'actionpack-xml_parser', git: 'https://github.com/rails/actionpack-xml_parser'
+gem 'actionpack-xml_parser', '>=1.0.1'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem 'therubyracer'
@@ -58,7 +58,7 @@ group :test do
   gem "database_cleaner"
   gem "mocha", :require => false
 
-  gem "aruba", git: 'https://github.com/cucumber/aruba', :require => false  # need 0.5.4 for piping files; 0.5.3 is latest
+  gem "aruba", ">=0.5.4", :require => false
 
   # Note that > 2.14 has problems, see:
   # https://code.google.com/p/selenium/issues/detail?id=3075
diff --git a/Gemfile.lock b/Gemfile.lock
index 28505feb..54dd24d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,19 +1,3 @@
-GIT
-  remote: https://github.com/cucumber/aruba
-  revision: fccb412d18d699b7ecacd0da6b2e5338987cf4eb
-  specs:
-    aruba (0.5.4)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-
-GIT
-  remote: https://github.com/rails/actionpack-xml_parser
-  revision: e1516064761ea26502cd79b283f6af0fa2b1edf5
-  specs:
-    actionpack-xml_parser (1.0.1)
-      actionpack (>= 4.0.0, < 5)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -28,6 +12,8 @@ GEM
       activesupport (= 4.1.1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
+    actionpack-xml_parser (1.0.1)
+      actionpack (>= 4.0.0.rc1)
     actionview (4.1.1)
       activesupport (= 4.1.1)
       builder (~> 3.1)
@@ -48,6 +34,10 @@ GEM
     acts_as_list (0.4.0)
       activerecord (>= 3.0)
     arel (5.0.1.20140414130214)
+    aruba (0.5.4)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
     bcrypt-ruby (3.0.1)
     builder (3.2.2)
     bullet (4.9.0)
@@ -213,9 +203,9 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   aasm
-  actionpack-xml_parser!
+  actionpack-xml_parser (>= 1.0.1)
   acts_as_list
-  aruba!
+  aruba (>= 0.5.4)
   bcrypt-ruby (~> 3.0.0)
   bullet
   cache_digests