diff --git a/Gemfile b/Gemfile
index 162f00dc0..10a19cc91 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,5 +14,12 @@ group :test do
   gem "contest", ">= 0.1.2"
   gem "mocha"
   gem "yard"
-  gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
+
+  platforms :mri_18 do
+    gem "ruby-debug"
+  end
+
+  platforms :mri_19 do
+    gem "ruby-debug19"
+  end
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 138cc92b7..c1a624a5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,7 @@ GEM
     abstract (1.0.0)
     archive-tar-minitar (0.5.2)
     builder (2.1.2)
+    columnize (0.3.1)
     contest (0.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -41,6 +42,9 @@ GEM
       rake (>= 0.8.7)
     i18n (0.4.1)
     json (1.4.6)
+    linecache (0.43)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     mario (0.0.6)
     mocha (0.9.8)
       rake
@@ -48,6 +52,21 @@ GEM
       net-ssh (>= 1.99.1)
     net-ssh (2.0.23)
     rake (0.8.7)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     thor (0.14.0)
     yard (0.5.8)
 
@@ -59,6 +78,8 @@ DEPENDENCIES
   mocha
   radar!
   rake
+  ruby-debug
+  ruby-debug19
   vagrant!
   virtualbox!
   yard
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 122005ead..361393529 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,6 +8,14 @@ require 'mocha'
 require 'support/path'
 require 'support/environment'
 
+# Try to load ruby debug since its useful if it is available.
+# But not a big deal if its not available (probably on a non-MRI
+# platform)
+begin
+  require 'ruby-debug'
+rescue LoadError
+end
+
 # Silence Mario by sending log output to black hole
 Mario::Platform.logger(nil)