diff --git a/activejob/Rakefile b/activejob/Rakefile
index 1922f256ec60eb99ffa400233b00f02f63b45a8c..6c7e6aae6ea1a9ff35026e1438e1b43d95a1afbe 100644
--- a/activejob/Rakefile
+++ b/activejob/Rakefile
@@ -28,7 +28,7 @@ namespace :test do
   end
 
   ACTIVEJOB_ADAPTERS.each do |adapter|
-    task("env:#{adapter}") { ENV['AJADAPTER'] = adapter }
+    task("env:#{adapter}") { ENV['AJ_ADAPTER'] = adapter }
 
     Rake::TestTask.new(adapter => "test:env:#{adapter}") do |t|
       t.description = "Run adapter tests for #{adapter}"
diff --git a/activejob/test/cases/adapter_test.rb b/activejob/test/cases/adapter_test.rb
index 6570c55a8374f5f455d269bbace46cea11ecbdb7..f0c710f9ed43473cc24c14cb124635b0f9952873 100644
--- a/activejob/test/cases/adapter_test.rb
+++ b/activejob/test/cases/adapter_test.rb
@@ -1,7 +1,7 @@
 require 'helper'
 
 class AdapterTest < ActiveSupport::TestCase
-  test "should load #{ENV['AJADAPTER']} adapter" do
-    assert_equal "active_job/queue_adapters/#{ENV['AJADAPTER']}_adapter".classify, ActiveJob::Base.queue_adapter.name
+  test "should load #{ENV['AJ_ADAPTER']} adapter" do
+    assert_equal "active_job/queue_adapters/#{ENV['AJ_ADAPTER']}_adapter".classify, ActiveJob::Base.queue_adapter.name
   end
 end
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index db5265d7b24e6b91036b40394e23214db3f715c9..72ec2b8904819fe5c9ed27e66222358cde1c44fa 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -5,7 +5,7 @@
 
 GlobalID.app = 'aj'
 
-@adapter  = ENV['AJADAPTER'] || 'inline'
+@adapter  = ENV['AJ_ADAPTER'] || 'inline'
 
 if ENV['AJ_INTEGRATION_TESTS']
   require 'support/integration/helper'
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb
index 65994d6a1c402792f42308c7aa72605220fe047f..09a68738adbf0861941ccba2cb11e679edbae4b4 100644
--- a/activejob/test/support/integration/dummy_app_template.rb
+++ b/activejob/test/support/integration/dummy_app_template.rb
@@ -1,4 +1,4 @@
-if ENV['AJADAPTER'] == 'delayed_job'
+if ENV['AJ_ADAPTER'] == 'delayed_job'
   generate "delayed_job:active_record", "--quiet"
   rake("db:migrate")
 end
diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb
index 39e41b6d2982ee3c496844153c05e1536985e33d..8c2e5a86c277cf2f6c95f3d1e77a958e3457a09c 100644
--- a/activejob/test/support/integration/helper.rb
+++ b/activejob/test/support/integration/helper.rb
@@ -1,4 +1,4 @@
-puts "*** rake aj:integration:#{ENV['AJADAPTER']} ***\n"
+puts "*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n"
 
 ENV["RAILS_ENV"] = "test"
 ActiveJob::Base.queue_name_prefix = nil
diff --git a/activejob/test/support/integration/jobs_manager.rb b/activejob/test/support/integration/jobs_manager.rb
index 4df34aaeb10fecb3555328bb9a96b5cebbab0ee4..78d48e8d9ab3c00e3a3ce1c5909b8a350cd3bcc9 100644
--- a/activejob/test/support/integration/jobs_manager.rb
+++ b/activejob/test/support/integration/jobs_manager.rb
@@ -3,7 +3,7 @@ class JobsManager
   attr :adapter_name
 
   def self.current_manager
-    @@managers[ENV['AJADAPTER']] ||= new(ENV['AJADAPTER'])
+    @@managers[ENV['AJ_ADAPTER']] ||= new(ENV['AJ_ADAPTER'])
   end
 
   def initialize(adapter_name)