diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index 98112b421..4b0ad7473 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -136,9 +136,9 @@ describe Contact do
       @contact.errors.full_messages.should match_array([])
     end
 
-    it 'should not accept new custom code' do
+    it 'should not overwrite code' do
       old_code = @contact.code
-      @contact.code = 'CID:REG1:12345'
+      @contact.code = 'CID:REG1:should-not-overwrite-old-code-12345'
       @contact.save.should == true
       @contact.code.should == old_code
     end
diff --git a/spec/models/registrar_spec.rb b/spec/models/registrar_spec.rb
index 63099712f..7024cdd8f 100644
--- a/spec/models/registrar_spec.rb
+++ b/spec/models/registrar_spec.rb
@@ -90,7 +90,8 @@ describe Registrar do
     end
 
     it 'should have contact prefix' do
-      @registrar.contact_prefix.should == 'CID:REGISTRAR0'
+      @registrar = Fabricate.build(:registrar, code: 'CUSTOMCODE')
+      @registrar.contact_prefix.should == 'CID:CUSTOMCODE'
     end
 
     it 'should have one version' do