diff --git a/src/oca/ruby/test/ClusterPool_spec.rb b/src/oca/ruby/test/ClusterPool_spec.rb
index e68f052ba4..fd30f0fdb3 100644
--- a/src/oca/ruby/test/ClusterPool_spec.rb
+++ b/src/oca/ruby/test/ClusterPool_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/Cluster_spec.rb b/src/oca/ruby/test/Cluster_spec.rb
index 953d1b99f8..bb2a30889a 100644
--- a/src/oca/ruby/test/Cluster_spec.rb
+++ b/src/oca/ruby/test/Cluster_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/HostPool_spec.rb b/src/oca/ruby/test/HostPool_spec.rb
index 52a02ba019..5d08319618 100644
--- a/src/oca/ruby/test/HostPool_spec.rb
+++ b/src/oca/ruby/test/HostPool_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/Host_spec.rb b/src/oca/ruby/test/Host_spec.rb
index 08af3d377e..e2d8cb39e4 100644
--- a/src/oca/ruby/test/Host_spec.rb
+++ b/src/oca/ruby/test/Host_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/UserPool_spec.rb b/src/oca/ruby/test/UserPool_spec.rb
index 6bd5fcba8c..765603a422 100644
--- a/src/oca/ruby/test/UserPool_spec.rb
+++ b/src/oca/ruby/test/UserPool_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/User_spec.rb b/src/oca/ruby/test/User_spec.rb
index e0f43f8f61..1a4085d4e2 100644
--- a/src/oca/ruby/test/User_spec.rb
+++ b/src/oca/ruby/test/User_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/VirtualMachinePool_spec.rb b/src/oca/ruby/test/VirtualMachinePool_spec.rb
index 8e7c81acba..28ffb96dd3 100644
--- a/src/oca/ruby/test/VirtualMachinePool_spec.rb
+++ b/src/oca/ruby/test/VirtualMachinePool_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/VirtualMachine_spec.rb b/src/oca/ruby/test/VirtualMachine_spec.rb
index e2fc6571ff..53c4397e05 100644
--- a/src/oca/ruby/test/VirtualMachine_spec.rb
+++ b/src/oca/ruby/test/VirtualMachine_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/VirtualNetworkPool_spec.rb b/src/oca/ruby/test/VirtualNetworkPool_spec.rb
index 51013dc20f..fd107827c6 100644
--- a/src/oca/ruby/test/VirtualNetworkPool_spec.rb
+++ b/src/oca/ruby/test/VirtualNetworkPool_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/VirtualNetwork_spec.rb b/src/oca/ruby/test/VirtualNetwork_spec.rb
index 0b19f675f9..b74982bf52 100644
--- a/src/oca/ruby/test/VirtualNetwork_spec.rb
+++ b/src/oca/ruby/test/VirtualNetwork_spec.rb
@@ -1,7 +1,7 @@
 $: << '../'
 
 require 'OpenNebula'
-require 'MockClient'
+require 'helpers/MockClient'
 
 module OpenNebula
 
diff --git a/src/oca/ruby/test/xml_test/cluster.xml b/src/oca/ruby/test/fixtures/cluster.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/cluster.xml
rename to src/oca/ruby/test/fixtures/cluster.xml
diff --git a/src/oca/ruby/test/xml_test/clusterpool.xml b/src/oca/ruby/test/fixtures/clusterpool.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/clusterpool.xml
rename to src/oca/ruby/test/fixtures/clusterpool.xml
diff --git a/src/oca/ruby/test/xml_test/host.xml b/src/oca/ruby/test/fixtures/host.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/host.xml
rename to src/oca/ruby/test/fixtures/host.xml
diff --git a/src/oca/ruby/test/xml_test/hostpool.xml b/src/oca/ruby/test/fixtures/hostpool.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/hostpool.xml
rename to src/oca/ruby/test/fixtures/hostpool.xml
diff --git a/src/oca/ruby/test/xml_test/user.xml b/src/oca/ruby/test/fixtures/user.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/user.xml
rename to src/oca/ruby/test/fixtures/user.xml
diff --git a/src/oca/ruby/test/xml_test/userpool.xml b/src/oca/ruby/test/fixtures/userpool.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/userpool.xml
rename to src/oca/ruby/test/fixtures/userpool.xml
diff --git a/src/oca/ruby/test/xml_test/vm.xml b/src/oca/ruby/test/fixtures/vm.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/vm.xml
rename to src/oca/ruby/test/fixtures/vm.xml
diff --git a/src/oca/ruby/test/xml_test/vmpool.xml b/src/oca/ruby/test/fixtures/vmpool.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/vmpool.xml
rename to src/oca/ruby/test/fixtures/vmpool.xml
diff --git a/src/oca/ruby/test/xml_test/vnet.xml b/src/oca/ruby/test/fixtures/vnet.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/vnet.xml
rename to src/oca/ruby/test/fixtures/vnet.xml
diff --git a/src/oca/ruby/test/xml_test/vnetpool.xml b/src/oca/ruby/test/fixtures/vnetpool.xml
similarity index 100%
rename from src/oca/ruby/test/xml_test/vnetpool.xml
rename to src/oca/ruby/test/fixtures/vnetpool.xml
diff --git a/src/oca/ruby/test/MockClient.rb b/src/oca/ruby/test/helpers/MockClient.rb
similarity index 72%
rename from src/oca/ruby/test/MockClient.rb
rename to src/oca/ruby/test/helpers/MockClient.rb
index 4fa7ed7b6d..d119eb552a 100644
--- a/src/oca/ruby/test/MockClient.rb
+++ b/src/oca/ruby/test/helpers/MockClient.rb
@@ -5,13 +5,13 @@ class MockClient
 
         case xmlrpc_action
             when "one.vn.info"
-                return File.read("xml_test/vnet.xml")
+                return File.read("fixtures/vnet.xml")
             when "one.vn.allocate"
                 return 3
             when "one.vn.delete"
                 return nil
             when "one.vm.info"
-                return File.read("xml_test/vm.xml")
+                return File.read("fixtures/vm.xml")
             when "one.vm.allocate"
                 return 6
             when "one.vm.delete"
@@ -23,7 +23,7 @@ class MockClient
             when "one.vm.migrate"
                 return nil
             when "one.host.info"
-                return File.read("xml_test/host.xml")
+                return File.read("fixtures/host.xml")
             when "one.host.allocate"
                 return 7
             when "one.host.delete"
@@ -33,13 +33,13 @@ class MockClient
             when "one.user.allocate"
                 return 3
             when "one.user.info"
-                return File.read("xml_test/user.xml")
+                return File.read("fixtures/user.xml")
             when "one.user.delete"
                 return nil
             when "one.cluster.allocate"
                 return 5
             when "one.cluster.info"
-                return File.read("xml_test/cluster.xml")
+                return File.read("fixtures/cluster.xml")
             when "one.cluster.delete"
                 return nil
             when "one.cluster.addhost"
@@ -47,15 +47,15 @@ class MockClient
             when "one.cluster.removehost"
                 return nil
             when "one.vnpool.info"
-                return File.read("xml_test/vnetpool.xml")
+                return File.read("fixtures/vnetpool.xml")
             when "one.vmpool.info"
-                return File.read("xml_test/vmpool.xml")
+                return File.read("fixtures/vmpool.xml")
             when "one.hostpool.info"
-                return File.read("xml_test/hostpool.xml")
+                return File.read("fixtures/hostpool.xml")
             when "one.userpool.info"
-                return File.read("xml_test/userpool.xml")
+                return File.read("fixtures/userpool.xml")
             when "one.clusterpool.info"
-                return File.read("xml_test/clusterpool.xml")
+                return File.read("fixtures/clusterpool.xml")
         end
     end
 end
\ No newline at end of file