diff --git a/lib/octokit.rb b/lib/octokit.rb
index f093d2185..17c0fac5f 100644
--- a/lib/octokit.rb
+++ b/lib/octokit.rb
@@ -1,10 +1,11 @@
-require 'octokit/client'
-require 'octokit/enterprise_admin_client'
-require 'octokit/enterprise_management_console_client'
 require 'octokit/default'
+require 'octokit/configurable'
 
 # 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 b6d4a480f..0b0dac95d 100644
--- a/lib/octokit/client.rb
+++ b/lib/octokit/client.rb
@@ -2,7 +2,6 @@
 require 'octokit/warnable'
 require 'octokit/arguments'
 require 'octokit/repo_arguments'
-require 'octokit/configurable'
 require 'octokit/authentication'
 require 'octokit/gist'
 require 'octokit/rate_limit'