diff --git a/lib/octokit.rb b/lib/octokit.rb
index 17c0fac5f..b27e3257b 100644
--- a/lib/octokit.rb
+++ b/lib/octokit.rb
@@ -1,12 +1,10 @@
 require 'octokit/default'
-require 'octokit/configurable'
+require 'octokit/client'
+require 'octokit/enterprise_admin_client'
+require 'octokit/enterprise_management_console_client'
 
 # Ruby toolkit for the GitHub API
 module Octokit
-  autoload(:Client, File.join(__dir__, 'octokit/client'))
-  autoload(:EnterpriseAdminClient, File.join(__dir__, 'octokit/enterprise_admin_client'))
-  autoload(:EnterpriseManagementConsoleClient, File.join(__dir__, 'octokit/enterprise_management_console_client'))
-
   class << self
     include Octokit::Configurable
 
diff --git a/lib/octokit/client.rb b/lib/octokit/client.rb
index b1fed4df5..e648c3133 100644
--- a/lib/octokit/client.rb
+++ b/lib/octokit/client.rb
@@ -2,6 +2,7 @@
 require 'octokit/warnable'
 require 'octokit/arguments'
 require 'octokit/repo_arguments'
+require 'octokit/configurable'
 require 'octokit/authentication'
 require 'octokit/gist'
 require 'octokit/rate_limit'