diff --git a/Gemfile b/Gemfile
index 5565a83e208..b11b4baaa9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -251,7 +251,7 @@ group :development do
 end
 
 group :development, :test do
-  gem 'puma', '~> 3.12.0'
+  gem 'puma', '~> 4.0.0'
   gem 'thin', '~> 1.7.2'
 
   # Tracing and profiling gems
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f01e81056f..55f23988394 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -647,7 +647,8 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (3.0.3)
-    puma (3.12.0)
+    puma (4.0.0)
+      nio4r (~> 2.0)
     rack (2.0.6)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -992,7 +993,7 @@ DEPENDENCIES
   pry-rails (~> 0.3.6)
   pry-rescue (~> 1.5.0)
   pry-stack_explorer (~> 0.4.9.2)
-  puma (~> 3.12.0)
+  puma (~> 4.0.0)
   rack-attack (~> 5.4.2)
   rack-mini-profiler
   rack-protection (~> 2.0.0)