diff --git a/spec/autoloaded/instance_struct.rb b/spec/autoloaded/instance_struct.rb
index 3b8a8ff13..68a9b9485 100644
--- a/spec/autoloaded/instance_struct.rb
+++ b/spec/autoloaded/instance_struct.rb
@@ -1,5 +1,6 @@
 module Autoloaded
-  class InstanceStruct < ::Struct.new(nil)
+  InstanceStruct = ::Struct.new(nil)
+  class InstanceStruct
     def perform
     end
   end
diff --git a/spec/autoloaded/struct.rb b/spec/autoloaded/struct.rb
index 3fbaeb4f7..4e20bd7b5 100644
--- a/spec/autoloaded/struct.rb
+++ b/spec/autoloaded/struct.rb
@@ -1,6 +1,7 @@
 # Make sure this file does not get required manually
 module Autoloaded
-  class Struct < ::Struct.new(nil)
+  Struct = ::Struct.new(nil)
+  class Struct
     def perform
     end
   end
diff --git a/spec/sample_jobs.rb b/spec/sample_jobs.rb
index 48217d2f5..0dc10d4b4 100644
--- a/spec/sample_jobs.rb
+++ b/spec/sample_jobs.rb
@@ -1,4 +1,5 @@
-class NamedJob < Struct.new(:perform)
+NamedJob = Struct.new(:perform)
+class NamedJob
   def display_name
     'named_job'
   end
@@ -26,7 +27,8 @@ def perform
   end
 end
 
-class CustomRescheduleJob < Struct.new(:offset)
+CustomRescheduleJob = Struct.new(:offset)
+class CustomRescheduleJob
   cattr_accessor :runs
   @runs = 0
   def perform