diff --git a/test/test_helper.rb b/test/helper.rb
similarity index 100%
rename from test/test_helper.rb
rename to test/helper.rb
diff --git a/test/hello-env.ru b/test/rackup/hello-env.ru
similarity index 100%
rename from test/hello-env.ru
rename to test/rackup/hello-env.ru
diff --git a/test/test_app_status.rb b/test/test_app_status.rb
index c45623af..76979756 100644
--- a/test/test_app_status.rb
+++ b/test/test_app_status.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/app/status"
 require "rack"
diff --git a/test/test_binder.rb b/test/test_binder.rb
index 89ea4610..246c9c4d 100644
--- a/test/test_binder.rb
+++ b/test/test_binder.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/binder"
 require "puma/events"
diff --git a/test/test_cli.rb b/test/test_cli.rb
index e047620e..891b5b9b 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/cli"
 
diff --git a/test/test_config.rb b/test/test_config.rb
index 01dd98f5..87c1be44 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/configuration"
 
diff --git a/test/test_events.rb b/test/test_events.rb
index 6fcc4ad2..76bea729 100644
--- a/test/test_events.rb
+++ b/test/test_events.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/events"
 
diff --git a/test/test_http10.rb b/test/test_http10.rb
index 129923a5..cba001bd 100644
--- a/test/test_http10.rb
+++ b/test/test_http10.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/puma_http11"
 
diff --git a/test/test_http11.rb b/test/test_http11.rb
index f36899da..3eb72fec 100644
--- a/test/test_http11.rb
+++ b/test/test_http11.rb
@@ -1,7 +1,7 @@
 # Copyright (c) 2011 Evan Phoenix
 # Copyright (c) 2005 Zed A. Shaw
 
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/puma_http11"
 
diff --git a/test/test_integration.rb b/test/test_integration.rb
index a17e9fe7..125d119d 100644
--- a/test/test_integration.rb
+++ b/test/test_integration.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/cli"
 require "puma/control_cli"
@@ -239,7 +239,7 @@ class TestIntegration < Minitest::Test
 
   # It does not share environments between multiple generations, which would break Dotenv
   def test_restart_restores_environment
-    server("-q test/hello-env.ru")
+    server("-q test/rackup/hello-env.ru")
 
     s = connect
     initial_reply = s.read
diff --git a/test/test_iobuffer.rb b/test/test_iobuffer.rb
index f409d7af..d075b794 100644
--- a/test/test_iobuffer.rb
+++ b/test/test_iobuffer.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/io_buffer"
 
diff --git a/test/test_minissl.rb b/test/test_minissl.rb
index 4f00757d..08d6529d 100644
--- a/test/test_minissl.rb
+++ b/test/test_minissl.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/minissl"
 
diff --git a/test/test_null_io.rb b/test/test_null_io.rb
index 8cde7cdc..5af9d6e0 100644
--- a/test/test_null_io.rb
+++ b/test/test_null_io.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/null_io"
 
diff --git a/test/test_persistent.rb b/test/test_persistent.rb
index c4696e83..42e35b0a 100644
--- a/test/test_persistent.rb
+++ b/test/test_persistent.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 class TestPersistent < Minitest::Test
   def setup
diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
index d7381cef..ad573ca7 100644
--- a/test/test_puma_server.rb
+++ b/test/test_puma_server.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 class TestPumaServer < Minitest::Test
 
diff --git a/test/test_puma_server_ssl.rb b/test/test_puma_server_ssl.rb
index c8bbd286..5fafa164 100644
--- a/test/test_puma_server_ssl.rb
+++ b/test/test_puma_server_ssl.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/events"
 
diff --git a/test/test_pumactl.rb b/test/test_pumactl.rb
index 8adecc7e..4d086f5e 100644
--- a/test/test_pumactl.rb
+++ b/test/test_pumactl.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require 'puma/control_cli'
 
diff --git a/test/test_rack_handler.rb b/test/test_rack_handler.rb
index df9524ce..4859b501 100644
--- a/test/test_rack_handler.rb
+++ b/test/test_rack_handler.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "rack/handler/puma"
 
diff --git a/test/test_rack_server.rb b/test/test_rack_server.rb
index da914e16..063d2f62 100644
--- a/test/test_rack_server.rb
+++ b/test/test_rack_server.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "rack"
 
diff --git a/test/test_tcp_logger.rb b/test/test_tcp_logger.rb
index 71496989..b3b82618 100644
--- a/test/test_tcp_logger.rb
+++ b/test/test_tcp_logger.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/events"
 require "puma/tcp_logger"
diff --git a/test/test_tcp_rack.rb b/test/test_tcp_rack.rb
index 0c03031e..d75b4812 100644
--- a/test/test_tcp_rack.rb
+++ b/test/test_tcp_rack.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/events"
 
diff --git a/test/test_thread_pool.rb b/test/test_thread_pool.rb
index 1312e39b..f57dd2c8 100644
--- a/test/test_thread_pool.rb
+++ b/test/test_thread_pool.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/thread_pool"
 
diff --git a/test/test_unix_socket.rb b/test/test_unix_socket.rb
index c9de90c0..fd2e2289 100644
--- a/test/test_unix_socket.rb
+++ b/test/test_unix_socket.rb
@@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"
 
 # UNIX sockets are not recommended on JRuby
 # (or Windows)
diff --git a/test/test_web_server.rb b/test/test_web_server.rb
index d872e157..cc691b5b 100644
--- a/test/test_web_server.rb
+++ b/test/test_web_server.rb
@@ -1,7 +1,7 @@
 # Copyright (c) 2011 Evan Phoenix
 # Copyright (c) 2005 Zed A. Shaw
 
-require_relative "test_helper"
+require_relative "helper"
 
 require "puma/server"