diff --git a/spec/factories/work_package_factory.rb b/spec/factories/work_package_factory.rb
index 97099bc76ed6..7535241326c9 100644
--- a/spec/factories/work_package_factory.rb
+++ b/spec/factories/work_package_factory.rb
@@ -74,7 +74,7 @@
     end
 
     callback(:after_build) do |work_package, evaluator|
-      work_package.type = work_package.project.types.first unless work_package.type
+      work_package.type ||= TestProf::FactoryBot.get_factory_default(:type) || work_package.project.types.first
 
       custom_values = evaluator.custom_values || {}
 
diff --git a/spec/services/relations/delete_service_spec.rb b/spec/services/relations/delete_service_spec.rb
index c7ca086233ff..4cde48c1dc13 100644
--- a/spec/services/relations/delete_service_spec.rb
+++ b/spec/services/relations/delete_service_spec.rb
@@ -39,6 +39,7 @@
   shared_let(:type_task) { create(:type_task, :default) }
   shared_let(:type_with_mandatory_cf) do
     create(:type,
+           position: type_task.position + 1,
            name: "Type with mandatory custom field",
            custom_fields: [mandatory_custom_field])
   end