diff --git a/Gemfile b/Gemfile
index b8ff92170..6685457ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -85,7 +85,7 @@ group :development, :test do
   gem 'epp', '~> 1.4.0'
 
   # EPP XMLs
-  gem 'epp-xml', git: 'git@github.com:gitlabeu/epp-xml.git'
+  #gem 'epp-xml', git: 'git@github.com:gitlabeu/epp-xml.git' # TODO: get this from rubygems
 
   # Replacement for fixtures
   gem 'fabrication', '~> 2.11.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ca1d38ca..f35d38ca6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: git@github.com:gitlabeu/epp-xml.git
-  revision: c9f4de93b942bcf8f19c59e7bf5680961593ddd3
-  specs:
-    epp-xml (0.0.1)
-      activesupport (~> 4.1, >= 4.1.4)
-      builder (~> 3.2, >= 3.2.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -367,7 +359,6 @@ DEPENDENCIES
   database_cleaner (~> 1.3.0)
   devise (~> 3.3.0)
   epp (~> 1.4.0)
-  epp-xml!
   fabrication (~> 2.11.3)
   faker (~> 1.3.0)
   guard (~> 2.6.1)
diff --git a/spec/epp/session_spec.rb b/spec/epp/session_spec.rb
index 3beb6e446..289ef94c9 100644
--- a/spec/epp/session_spec.rb
+++ b/spec/epp/session_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe 'EPP Session', epp: true do
   let(:server_gitlab) { Epp::Server.new({ server: 'localhost', tag: 'gitlab', password: 'ghyt9e4fu', port: 701 }) }
-  let(:login_xml_cache) { EppXml::Session.login(clID: { value: 'gitlab' }, pw: { value: 'ghyt9e4fu' }) }
+  let(:login_xml_cache) { login_xml }
 
   context 'when not connected' do
     it 'greets client upon connection' do