diff --git a/Rakefile b/Rakefile
index 987d0fcbff3ce..8255084b21b4a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -246,16 +246,22 @@ task :test_java => [
 task :test_rb => [
   "//rb:unit-test",
   "//rb:rc-client-unit-test",
-  "//rb:firefox-test",
-  "//rb:remote-test",
   "//rb:rc-client-integration-test",
   "//rb:chrome-test",
+  "//rb:firefox-test",
   "//rb:phantomjs-test",
+  "//rb:remote-chrome-test",
+  "//rb:remote-firefox-test",
+  "//rb:remote-phantomjs-test",
   ("//rb:wires-test" if ENV['MARIONETTE_PATH']),
+  ("//rb:remote-wires-test" if ENV['MARIONETTE_PATH']),
   ("//rb:safari-test" if mac?),
+  ("//rb:remote-safari-test" if mac?),
   ("//rb:ie-test" if windows?),
-  ("//rb:edge-test" if windows?)
-     ].compact
+  ("//rb:remote-ie-test" if windows?),
+  ("//rb:edge-test" if windows?),
+  ("//rb:remote-edge-test" if windows?)
+].compact
 
 task :test_py => [ :py_prep_for_install_release, "//py:firefox_test:run" ]
 
diff --git a/rake-tasks/crazy_fun/mappings/ruby.rb b/rake-tasks/crazy_fun/mappings/ruby.rb
index 17a0fd8b96b35..e6064682af87f 100644
--- a/rake-tasks/crazy_fun/mappings/ruby.rb
+++ b/rake-tasks/crazy_fun/mappings/ruby.rb
@@ -92,7 +92,13 @@ def handle(fun, dir, args)
         STDOUT.sync = true
         puts "Running: #{args[:name]} ruby tests"
 
-        ENV['WD_SPEC_DRIVER'] = args[:name]
+        if args[:name].match /^remote-(.*)/
+          ENV['WD_REMOTE_BROWSER'] = $1
+          ENV['WD_SPEC_DRIVER'] = 'remote'
+        else
+          ENV['WD_SPEC_DRIVER'] = args[:name]
+        end
+
         ENV['CI_REPORTS']     = "build/test_logs"
 
         ruby :include => args[:include],
diff --git a/rb/build.desc b/rb/build.desc
index b6566549689a4..c518fdc5deddf 100644
--- a/rb/build.desc
+++ b/rb/build.desc
@@ -239,6 +239,90 @@ ruby_test(name = "remote",
   ]
 )
 
+ruby_test(name = "remote-chrome",
+  srcs = [
+    "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+  ],
+  include = ["rb/spec/integration", "build/rb/lib"],
+  deps = [
+    "//java/server/test/org/openqa/selenium:server-with-tests:uber",
+    ":remote"
+  ]
+)
+
+ruby_test(name = "remote-firefox",
+  srcs = [
+    "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+  ],
+  include = ["rb/spec/integration", "build/rb/lib"],
+  deps = [
+    "//java/server/test/org/openqa/selenium:server-with-tests:uber",
+    ":remote"
+  ]
+)
+
+ruby_test(name = "remote-phantomjs",
+  srcs = [
+    "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+  ],
+  include = ["rb/spec/integration", "build/rb/lib"],
+  deps = [
+    "//java/server/test/org/openqa/selenium:server-with-tests:uber",
+    ":remote"
+  ]
+)
+
+ruby_test(name = "remote-safari",
+  srcs = [
+    "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+  ],
+  include = ["rb/spec/integration", "build/rb/lib"],
+  deps = [
+    "//java/server/test/org/openqa/selenium:server-with-tests:uber",
+    ":remote"
+  ]
+)
+
+ruby_test(name = "remote-ie",
+  srcs = [
+    "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+  ],
+  include = ["rb/spec/integration", "build/rb/lib"],
+  deps = [
+    "//java/server/test/org/openqa/selenium:server-with-tests:uber",
+    ":remote"
+  ]
+)
+
+ruby_test(name = "remote-edge",
+  srcs = [
+    "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+  ],
+  include = ["rb/spec/integration", "build/rb/lib"],
+  deps = [
+    "//java/server/test/org/openqa/selenium:server-with-tests:uber",
+    ":remote"
+  ]
+)
+
+ruby_test(name = "remote-wires",
+  srcs = [
+    "spec/integration/selenium/webdriver/*_spec.rb",
+    "spec/integration/selenium/webdriver/remote/**/*_spec.rb"
+  ],
+  include = ["rb/spec/integration", "build/rb/lib"],
+  deps = [
+    "//java/server/test/org/openqa/selenium:server-with-tests:uber",
+    ":remote"
+  ]
+)
+
 ruby_library(name = "safari",
   srcs = [
     "lib/selenium/webdriver/safari/**/*.rb",