diff --git a/spec/controllers/objects_controller_spec.rb b/spec/controllers/objects_controller_spec.rb
index f4ddca25c..6f0ac826d 100644
--- a/spec/controllers/objects_controller_spec.rb
+++ b/spec/controllers/objects_controller_spec.rb
@@ -5,7 +5,7 @@
     login
   end
 
-  let(:item) { AssembleableVersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
+  let(:item) { VersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
 
   before do
     allow(Dor).to receive(:find).and_return(item)
@@ -113,14 +113,14 @@
 
   describe '/release_tags' do
     it 'adds a release tag when posted to with false' do
-      expect(ReleaseTags).to receive(:create).with(AssembleableVersionableItem, release: false, to: 'searchworks', who: 'carrickr', what: 'self')
+      expect(ReleaseTags).to receive(:create).with(VersionableItem, release: false, to: 'searchworks', who: 'carrickr', what: 'self')
       expect(item).to receive(:save)
       post :release_tags, params: { id: item.pid }, body: %( {"to":"searchworks","who":"carrickr","what":"self","release":false} )
       expect(response.status).to eq(201)
     end
 
     it 'adds a release tag when posted to with true' do
-      expect(ReleaseTags).to receive(:create).with(AssembleableVersionableItem, release: true, to: 'searchworks', who: 'carrickr', what: 'self')
+      expect(ReleaseTags).to receive(:create).with(VersionableItem, release: true, to: 'searchworks', who: 'carrickr', what: 'self')
       expect(item).to receive(:save)
       post :release_tags, params: { id: item.pid }, body: %( {"to":"searchworks","who":"carrickr","what":"self","release":true} )
       expect(response.status).to eq(201)
diff --git a/spec/controllers/sdr_controller_spec.rb b/spec/controllers/sdr_controller_spec.rb
index 75aee245c..53c4ced73 100644
--- a/spec/controllers/sdr_controller_spec.rb
+++ b/spec/controllers/sdr_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe SdrController do
-  let(:item) { AssembleableVersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
+  let(:item) { VersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
 
   before do
     allow(Dor).to receive(:find).and_return(item)
diff --git a/spec/controllers/versions_controller_spec.rb b/spec/controllers/versions_controller_spec.rb
index 9d6c838b4..60b083fbb 100644
--- a/spec/controllers/versions_controller_spec.rb
+++ b/spec/controllers/versions_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe VersionsController do
-  let(:item) { AssembleableVersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
+  let(:item) { VersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
 
   before do
     allow(Dor).to receive(:find).and_return(item)
diff --git a/spec/controllers/workflows_controller_spec.rb b/spec/controllers/workflows_controller_spec.rb
index 7be3c0be0..25fa82dfb 100644
--- a/spec/controllers/workflows_controller_spec.rb
+++ b/spec/controllers/workflows_controller_spec.rb
@@ -21,7 +21,7 @@
   end
 
   describe 'workflow archiving' do
-    let(:item) { AssembleableVersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
+    let(:item) { VersionableItem.new.tap { |x| x.pid = 'druid:aa123bb4567' } }
 
     before do
       allow(Dor).to receive(:find).with(item.pid).and_return(item)
diff --git a/spec/services/workspace_service_spec.rb b/spec/services/workspace_service_spec.rb
index 662c2af01..7eacebfcb 100644
--- a/spec/services/workspace_service_spec.rb
+++ b/spec/services/workspace_service_spec.rb
@@ -23,7 +23,7 @@
 
   describe '.create' do
     let(:druid_path) { File.join(temp_workspace, 'aa', '123', 'bb', '7890', 'aa123bb7890') }
-    let(:work) { AssembleableVersionableItem.new.tap { |x| x.pid = 'druid:aa123bb7890' } }
+    let(:work) { VersionableItem.new.tap { |x| x.pid = 'druid:aa123bb7890' } }
 
     before do
       FileUtils.rm_rf(File.join(temp_workspace, 'aa'))
diff --git a/spec/support/assembleable_versionable_item.rb b/spec/support/assembleable_versionable_item.rb
deleted file mode 100644
index ce8cfa0ec..000000000
--- a/spec/support/assembleable_versionable_item.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AssembleableVersionableItem < ActiveFedora::Base
-  include Dor::Assembleable
-  include Dor::Versionable
-  attr_accessor :pid
-end
diff --git a/spec/support/versionable_item.rb b/spec/support/versionable_item.rb
new file mode 100644
index 000000000..f45601565
--- /dev/null
+++ b/spec/support/versionable_item.rb
@@ -0,0 +1,4 @@
+class VersionableItem < ActiveFedora::Base
+  include Dor::Versionable
+  attr_accessor :pid
+end