diff --git a/spec/units/spec_helper.rb b/spec/units/spec_helper.rb
index d589bf89..7c15e9bb 100644
--- a/spec/units/spec_helper.rb
+++ b/spec/units/spec_helper.rb
@@ -22,36 +22,3 @@
 Restfulie::Common::Logger.logger = ActiveSupport::BufferedLogger.new(File.join(File.dirname(__FILE__), "logs", "spec.log"))
 
 ActionController::Base.view_paths = RAILS_ROOT + "/views" 
-
-module ResponseMatchers
-
-  class ResponseStatus
-
-    def initialize(response_code)
-      @expected_code = response_code.to_i
-    end
-
-    def matches?(response_header)
-      @actual_code = response_header[2].code
-      @expected_code == @actual_code
-    end
-
-    def failure_message
-        "expected response status to be #{@expected_code} but it's #{@actual_code}"
-    end
-
-    def negative_failure_message
-        "didn't expect #{@expected_code} to be #{@actual_code}"
-    end
-
-  end
-
-  def respond_with_status(response_code)
-    ResponseStatus.new(response_code)
-  end
-
-end
-
-Spec::Runner.configure do |config|
-   config.include(ResponseMatchers)
-end
\ No newline at end of file
diff --git a/tests/spec/requests/_integration_client.txt b/tests/spec/requests/_integration_client.txt
new file mode 100644
index 00000000..d7d7248b
--- /dev/null
+++ b/tests/spec/requests/_integration_client.txt
@@ -0,0 +1 @@
+Those tests are integration tests (as in the server side) but full end-to-end tests, with code from the Restfulie client side.
\ No newline at end of file
diff --git a/spec/units/client/http/adapter_spec.rb b/tests/spec/requests/http/adapter_spec.rb
similarity index 100%
rename from spec/units/client/http/adapter_spec.rb
rename to tests/spec/requests/http/adapter_spec.rb
diff --git a/spec/units/client/http/builder_spec.rb b/tests/spec/requests/http/builder_spec.rb
similarity index 100%
rename from spec/units/client/http/builder_spec.rb
rename to tests/spec/requests/http/builder_spec.rb
diff --git a/spec/units/client/http/marshal_spec.rb b/tests/spec/requests/http/marshal_spec.rb
similarity index 98%
rename from spec/units/client/http/marshal_spec.rb
rename to tests/spec/requests/http/marshal_spec.rb
index ef982318..c4841aae 100644
--- a/spec/units/client/http/marshal_spec.rb
+++ b/tests/spec/requests/http/marshal_spec.rb
@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../lib/data_helper')
 
 context Restfulie::Client::HTTP::RequestMarshaller do
 
diff --git a/tests/spec/spec_helper.rb b/tests/spec/spec_helper.rb
index 34d2c1b4..8b0c1cb1 100644
--- a/tests/spec/spec_helper.rb
+++ b/tests/spec/spec_helper.rb
@@ -8,6 +8,35 @@
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+module ResponseMatchers
+
+  class ResponseStatus
+
+    def initialize(response_code)
+      @expected_code = response_code.to_i
+    end
+
+    def matches?(response_header)
+      @actual_code = response_header[2].code
+      @expected_code == @actual_code
+    end
+
+    def failure_message
+        "expected response status to be #{@expected_code} but it's #{@actual_code}"
+    end
+
+    def negative_failure_message
+        "didn't expect #{@expected_code} to be #{@actual_code}"
+    end
+
+  end
+
+  def respond_with_status(response_code)
+    ResponseStatus.new(response_code)
+  end
+
+end
+
 RSpec.configure do |config|
   # == Mock Framework
   #
@@ -24,4 +53,6 @@
   # examples within a transaction, comment the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
+
+  config.include(ResponseMatchers)
 end
diff --git a/spec/units/lib/data_helper.rb b/tests/spec/support/data_helper.rb
similarity index 100%
rename from spec/units/lib/data_helper.rb
rename to tests/spec/support/data_helper.rb