diff --git a/test/ab_rs.rb b/test/config/ab_rs.rb
similarity index 100%
rename from test/ab_rs.rb
rename to test/config/ab_rs.rb
diff --git a/test/config.rb b/test/config/simple.rb
similarity index 100%
rename from test/config.rb
rename to test/config/simple.rb
diff --git a/test/ssl_config.rb b/test/config/ssl_config.rb
similarity index 100%
rename from test/ssl_config.rb
rename to test/config/ssl_config.rb
diff --git a/test/hello-bind.ru b/test/rackup/hello-bind.ru
similarity index 100%
rename from test/hello-bind.ru
rename to test/rackup/hello-bind.ru
diff --git a/test/hello-delay.ru b/test/rackup/hello-delay.ru
similarity index 100%
rename from test/hello-delay.ru
rename to test/rackup/hello-delay.ru
diff --git a/test/hello-map.ru b/test/rackup/hello-map.ru
similarity index 100%
rename from test/hello-map.ru
rename to test/rackup/hello-map.ru
diff --git a/test/hello-post.ru b/test/rackup/hello-post.ru
similarity index 100%
rename from test/hello-post.ru
rename to test/rackup/hello-post.ru
diff --git a/test/hello-stuck.ru b/test/rackup/hello-stuck.ru
similarity index 100%
rename from test/hello-stuck.ru
rename to test/rackup/hello-stuck.ru
diff --git a/test/hello-tcp.ru b/test/rackup/hello-tcp.ru
similarity index 100%
rename from test/hello-tcp.ru
rename to test/rackup/hello-tcp.ru
diff --git a/test/hello.ru b/test/rackup/hello.ru
similarity index 100%
rename from test/hello.ru
rename to test/rackup/hello.ru
diff --git a/test/hijack.ru b/test/rackup/hijack.ru
similarity index 100%
rename from test/hijack.ru
rename to test/rackup/hijack.ru
diff --git a/test/hijack2.ru b/test/rackup/hijack2.ru
similarity index 100%
rename from test/hijack2.ru
rename to test/rackup/hijack2.ru
diff --git a/test/lobster.ru b/test/rackup/lobster.ru
similarity index 100%
rename from test/lobster.ru
rename to test/rackup/lobster.ru
diff --git a/test/slow.ru b/test/rackup/slow.ru
similarity index 100%
rename from test/slow.ru
rename to test/rackup/slow.ru
diff --git a/test/test_cli.rb b/test/test_cli.rb
index 128153bd..d72cfa7a 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -44,7 +44,7 @@ class TestCLI < Minitest::Test
     cli = Puma::CLI.new ["-b", "tcp://127.0.0.1:9876",
                          "--control", url,
                          "--control-token", "",
-                         "test/lobster.ru"], @events
+                         "test/rackup/lobster.ru"], @events
 
     t = Thread.new do
       Thread.current.abort_on_exception = true
@@ -71,7 +71,7 @@ class TestCLI < Minitest::Test
                          "-w", "2",
                          "--control", url,
                          "--control-token", "",
-                         "test/lobster.ru"], @events
+                         "test/rackup/lobster.ru"], @events
 
     t = Thread.new { cli.run }
     t.abort_on_exception = true
@@ -106,7 +106,7 @@ class TestCLI < Minitest::Test
     cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
                          "--control", url,
                          "--control-token", "",
-                         "test/lobster.ru"], @events
+                         "test/rackup/lobster.ru"], @events
 
     t = Thread.new { cli.run }
     t.abort_on_exception = true
@@ -129,7 +129,7 @@ class TestCLI < Minitest::Test
     cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}",
                          "--control", url,
                          "--control-token", "",
-                         "test/lobster.ru"], @events
+                         "test/rackup/lobster.ru"], @events
 
     t = Thread.new { cli.run }
     t.abort_on_exception = true
diff --git a/test/test_config.rb b/test/test_config.rb
index 2f450c1c..e1960a96 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -5,7 +5,7 @@ require "puma/configuration"
 class TestConfigFile < Minitest::Test
   def test_app_from_rackup
     conf = Puma::Configuration.new do |c|
-      c.rackup "test/hello-bind.ru"
+      c.rackup "test/rackup/hello-bind.ru"
     end
     conf.load
 
diff --git a/test/test_integration.rb b/test/test_integration.rb
index d0a81aab..355b6e0a 100644
--- a/test/test_integration.rb
+++ b/test/test_integration.rb
@@ -109,7 +109,7 @@ class TestIntegration < Minitest::Test
       c.state_path @state_path
       c.bind "unix://#{@bind_path}"
       c.activate_control_app "unix://#{@control_path}", :auth_token => @token
-      c.rackup "test/hello.ru"
+      c.rackup "test/rackup/hello.ru"
     end
 
     l = Puma::Launcher.new conf, :events => @events
@@ -149,7 +149,7 @@ class TestIntegration < Minitest::Test
       c.activate_control_app "unix://#{@control_path}", :auth_token => @token
       c.workers 2
       c.worker_shutdown_timeout 1
-      c.rackup "test/hello-stuck.ru"
+      c.rackup "test/rackup/hello-stuck.ru"
     end
 
     l = Puma::Launcher.new conf, :events => @events
@@ -209,7 +209,7 @@ class TestIntegration < Minitest::Test
   end
 
   def test_restart_closes_keepalive_sockets
-    server("-q test/hello.ru")
+    server("-q test/rackup/hello.ru")
 
     s = connect
     s.read
@@ -226,7 +226,7 @@ class TestIntegration < Minitest::Test
       return
     end
 
-    server("-q -w 2 test/hello.ru")
+    server("-q -w 2 test/rackup/hello.ru")
 
     s = connect
     s.read