diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java b/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java
index 93ac146d74..bf9d920e25 100644
--- a/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java
+++ b/source/java/org/alfresco/repo/dictionary/DictionaryModelType.java
@@ -353,7 +353,7 @@ public class DictionaryModelType implements ContentServicePolicies.OnContentUpda
                     {
                         public Object doWork()
                         {            
-                            // Find out whether the model is active (by default it is)
+                            // Find out whether the model is active
                             boolean isActive = false;
                             Boolean value = (Boolean)nodeService.getProperty(nodeRef, ContentModel.PROP_MODEL_ACTIVE);
                             if (value != null)
diff --git a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
index 21e6979f0c..1a6af76f59 100644
--- a/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
+++ b/source/java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
@@ -224,6 +224,9 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
                     propertyName);        
         contentWriter1.putContent(modelOne);
         
+        // activate the model
+        nodeService.setProperty(model, ContentModel.PROP_MODEL_ACTIVE, new Boolean(true));
+        
         return model;
     }