diff --git a/spec/savon/fixtures/config.yml b/spec/fixtures/config.yml
similarity index 100%
rename from spec/savon/fixtures/config.yml
rename to spec/fixtures/config.yml
diff --git a/spec/savon/fixtures/invalid_config.yml b/spec/fixtures/invalid_config.yml
similarity index 100%
rename from spec/savon/fixtures/invalid_config.yml
rename to spec/fixtures/invalid_config.yml
diff --git a/spec/kalibro_entities_spec.rb b/spec/kalibro_entities_spec.rb
index 6d08b3b..3dac586 100644
--- a/spec/kalibro_entities_spec.rb
+++ b/spec/kalibro_entities_spec.rb
@@ -46,7 +46,7 @@
         after(:each) {KalibroClient.configure(config)}
 
         it 'should set the config' do
-          KalibroClient.configure_with('spec/savon/fixtures/config.yml')
+          KalibroClient.configure_with('spec/fixtures/config.yml')
 
           expect(KalibroClient.config).to eq({
             processor_address: 'http://test1.test1',
@@ -61,14 +61,14 @@
         end
 
         it 'should keep the defaults' do
-          KalibroClient.configure_with('spec/savon/fixtures/inexistent_file.yml')
+          KalibroClient.configure_with('spec/fixtures/inexistent_file.yml')
           expect(KalibroClient.config).to eq(config)
         end
 
         it 'should log an warning' do
           @logger.expects(:warn).with("YAML configuration file couldn't be found. Using defaults.")
 
-          KalibroClient.configure_with('spec/savon/fixtures/inexistent_file.yml')
+          KalibroClient.configure_with('spec/fixtures/inexistent_file.yml')
         end
       end
 
@@ -79,14 +79,14 @@
         end
 
         it 'should keep the defaults' do
-          KalibroClient.configure_with('spec/savon/fixtures/invalid_config.yml')
+          KalibroClient.configure_with('spec/fixtures/invalid_config.yml')
           expect(KalibroClient.config).to eq(config)
         end
 
         it 'should log an warning' do
           @logger.expects(:warn).with("YAML configuration file contains invalid syntax. Using defaults.")
 
-          KalibroClient.configure_with('spec/savon/fixtures/invalid_config.yml')
+          KalibroClient.configure_with('spec/fixtures/invalid_config.yml')
         end
       end
     end
diff --git a/spec/savon/fixtures/project/does_not_exists.xml b/spec/savon/fixtures/project/does_not_exists.xml
deleted file mode 100644
index 6d6cea0..0000000
--- a/spec/savon/fixtures/project/does_not_exists.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"><S:Body><ns2:projectExistsResponse xmlns:ns2="http://service.kalibro.org/"><exists>false</exists></ns2:projectExistsResponse></S:Body></S:Envelope>
\ No newline at end of file
diff --git a/spec/savon/savon_test_helper.rb b/spec/savon/savon_test_helper.rb
deleted file mode 100644
index 16fc034..0000000
--- a/spec/savon/savon_test_helper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module SavonTestHelper
-  HttpMock = Struct.new(:code, :headers, :body) do
-    def error?
-      false
-    end
-  end
-
-  def mock_savon_response(xml_response, code = 200, headers = {})
-    http = HttpMock.new(code, headers, xml_response)
-    savon_local_options = Savon::LocalOptions.new
-    savon_global_options = Savon::GlobalOptions.new
-    savon_response = Savon::Response.new(http, savon_global_options, savon_local_options)
-  end
-end
\ No newline at end of file