diff --git a/Gemfile b/Gemfile
index ebfd3aba..545b0121 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ platform :mri do
 
   group :development, :test do
     gem 'pry'
-    gem 'pry-debugger'
+    gem 'pry-byebug'
   end
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f36849d6..59ff6854 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,6 +17,9 @@ GEM
       multi_json (>= 1.0.0)
     bcrypt (3.1.7)
     builder (3.2.2)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
     capybara (2.4.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -42,12 +45,7 @@ GEM
       nokogiri (>= 1.4.2)
       rack (>= 1.1.0)
       uuidtools (~> 2.1.1)
-    debugger (1.6.6)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.5)
     docile (1.1.3)
     erubis (2.7.0)
     extlib (0.9.16)
@@ -115,9 +113,9 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
+    pry-byebug (1.3.2)
+      byebug (~> 2.7)
+      pry (~> 0.9.12)
     puma (2.8.1)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
@@ -231,7 +229,7 @@ DEPENDENCIES
   phantomjs
   poltergeist
   pry
-  pry-debugger
+  pry-byebug
   puma
   rack-recaptcha
   rack-test