diff --git a/Gemfile b/Gemfile
index 795dac2c..0cb468f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,8 +7,7 @@ gem 'coffee-rails', '~> 3.2.1'
 gem 'uglifier'
 
 group :development do
-  gem 'byebug',   platform: 'mri_21'
-  gem 'debugger', platform: 'mri_19'
+  gem 'byebug'
 end
 
 gem 'data_checker', :git => 'git@git.nedforce.nl:data_checker.git', :branch => 'master'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e91b41f..c8abf508 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,10 +98,8 @@ GEM
       activesupport (>= 2)
     bartt-ssl_requirement (1.4.2)
     builder (3.0.4)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
+    byebug (5.0.0)
+      columnize (= 0.9.0)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -117,12 +115,6 @@ GEM
     coffee-script-source (1.5.0)
     columnize (0.9.0)
     crass (1.0.2)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.8)
     dsl_accessor (0.3.3)
     dynamic_attributes (1.2.0)
     erubis (2.7.0)
@@ -228,7 +220,6 @@ GEM
     settler (1.2.4)
       rails
     simple-rss (1.3.1)
-    slop (3.6.0)
     sortifiable (0.2.8)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
@@ -265,7 +256,6 @@ DEPENDENCIES
   byebug
   coffee-rails (~> 3.2.1)
   data_checker!
-  debugger
   devcms_core!
   faker (~> 1.0.1)
   fakeweb
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 01de8f17..819ad967 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,12 +4,7 @@
 require 'rails/test_help'
 require 'mocha/setup'
 require 'html_test'
-if RUBY_VERSION =~ /^2\.\d{1}\.\d{1}$/
-  require 'byebug'
-else
-  require 'debugger'
-  Debugger.settings[:autoeval] = true
-end
+require 'byebug'
 
 Rails.backtrace_cleaner.remove_silencers!