diff --git a/source/java/org/alfresco/util/test/junitrules/TemporaryNodes.java b/source/java/org/alfresco/util/test/junitrules/TemporaryNodes.java
index 162c0eb14d..299016cff9 100644
--- a/source/java/org/alfresco/util/test/junitrules/TemporaryNodes.java
+++ b/source/java/org/alfresco/util/test/junitrules/TemporaryNodes.java
@@ -26,11 +26,14 @@ import java.util.List;
 import java.util.Map;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -122,6 +125,23 @@ public class TemporaryNodes extends ExternalResource
      * @return the newly created NodeRef.
      */
     public NodeRef createNode(final NodeRef parentNode, final String nodeCmName, final QName nodeType, final String nodeCreator)
+    {
+        return this.createNodeWithTextContent(parentNode, nodeCmName, nodeType, nodeCreator, null);
+    }
+    
+    /**
+     * This method creates a NodeRef with some text/plain, UTF-8 content and adds it to the internal list of NodeRefs to be tidied up by the rule.
+     * This method will be run in its own transaction and will be run with the specified user as the fully authenticated user,
+     * thus ensuring the named user is the cm:creator of the new node.
+     * 
+     * @param parentNode the parent node
+     * @param nodeCmName the cm:name of the new node
+     * @param nodeType   the type of the new node
+     * @param nodeCreator the username of the person who will create the node
+     * @param textContent the text/plain, UTF-8 content that will be stored in the node's content. <code>null</code> content will not be written.
+     * @return the newly created NodeRef.
+     */
+    public NodeRef createNodeWithTextContent(final NodeRef parentNode, final String nodeCmName, final QName nodeType, final String nodeCreator, final String textContent)
     {
         final RetryingTransactionHelper transactionHelper = (RetryingTransactionHelper) appContextRule.getApplicationContext().getBean("retryingTransactionHelper");
         
@@ -142,6 +162,16 @@ public class TemporaryNodes extends ExternalResource
                             childName,
                             nodeType,
                             props);
+                
+                // If there is any content, add it.
+                if (textContent != null)
+                {
+                    ContentService contentService = appContextRule.getApplicationContext().getBean("contentService", ContentService.class);
+                    ContentWriter writer = contentService.getWriter(childAssoc.getChildRef(), ContentModel.PROP_CONTENT, true);
+                    writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                    writer.setEncoding("UTF-8");
+                    writer.putContent(textContent);
+                }
                 return childAssoc.getChildRef();
             }
         });
diff --git a/source/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java b/source/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java
new file mode 100644
index 0000000000..09f5cb2f59
--- /dev/null
+++ b/source/java/org/alfresco/util/test/junitrules/TemporaryNodesTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.util.test.junitrules;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+
+/**
+ * Test class for {@link TemporaryNodes}.
+ * 
+ * @author Neil McErlean
+ * @since Odin
+ */
+public class TemporaryNodesTest
+{
+    // Rule to initialise the default Alfresco spring configuration
+    public static ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit();
+    
+    // Rules to create test users.
+    public static AlfrescoPerson TEST_USER1 = new AlfrescoPerson(APP_CONTEXT_INIT, "UserOne");
+    public static AlfrescoPerson TEST_USER2 = new AlfrescoPerson(APP_CONTEXT_INIT, "UserTwo");
+    
+    // A rule to manage test nodes reused across all the test methods
+    public static TemporaryNodes STATIC_TEST_NODES = new TemporaryNodes(APP_CONTEXT_INIT);
+    
+    // Tie them together in a static Rule Chain
+    @ClassRule public static RuleChain ruleChain = RuleChain.outerRule(APP_CONTEXT_INIT)
+                                                            .around(TEST_USER1)
+                                                            .around(TEST_USER2)
+                                                            .around(STATIC_TEST_NODES);
+    
+    // A rule to manage test nodes use in each test method
+    @Rule public TemporaryNodes testNodes = new TemporaryNodes(APP_CONTEXT_INIT);
+    
+    // A rule to allow individual test methods all to be run as "admin".
+    @Rule public RunAsFullyAuthenticatedRule runAsRule = new RunAsFullyAuthenticatedRule(AuthenticationUtil.getAdminUserName());
+    
+    // Various services
+    private static ContentService              CONTENT_SERVICE;
+    private static NodeService                 NODE_SERVICE;
+    private static RetryingTransactionHelper   TRANSACTION_HELPER;
+    
+    private static NodeRef COMPANY_HOME;
+    
+    // These NodeRefs are used by the test methods.
+    private NodeRef testNode1, testNode2;
+    
+    @BeforeClass public static void initStaticData() throws Exception
+    {
+        CONTENT_SERVICE    = APP_CONTEXT_INIT.getApplicationContext().getBean("contentService", ContentService.class);
+        NODE_SERVICE       = APP_CONTEXT_INIT.getApplicationContext().getBean("nodeService", NodeService.class);
+        TRANSACTION_HELPER = APP_CONTEXT_INIT.getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
+        
+        Repository repositoryHelper = APP_CONTEXT_INIT.getApplicationContext().getBean("repositoryHelper", Repository.class);
+        COMPANY_HOME = repositoryHelper.getCompanyHome();
+    }
+    
+    @Before public void createTestContent()
+    {
+        // Create some test content
+        testNode1 = testNodes.createNode(COMPANY_HOME,                  "doc 1",     ContentModel.TYPE_CONTENT, TEST_USER1.getUsername());
+        testNode2 = testNodes.createNodeWithTextContent(COMPANY_HOME,   "doc 2",     ContentModel.TYPE_CONTENT, TEST_USER2.getUsername(), "Hello world");
+    }
+    
+    @Test public void ensureTestNodesWereCreatedOk() throws Exception
+    {
+        TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                assertTrue("Test node does not exist", NODE_SERVICE.exists(testNode1));
+                assertTrue("Test node does not exist", NODE_SERVICE.exists(testNode2));
+                
+                Map<QName, Serializable> node1Props = NODE_SERVICE.getProperties(testNode1);
+                Map<QName, Serializable> node2Props = NODE_SERVICE.getProperties(testNode2);
+                
+                // name
+                assertEquals("cm:name was wrong", "doc 1", node1Props.get(ContentModel.PROP_NAME));
+                assertEquals("cm:name was wrong", "doc 2", node2Props.get(ContentModel.PROP_NAME));
+                
+                // creator
+                assertEquals("cm:creator was wrong", TEST_USER1.getUsername(), node1Props.get(ContentModel.PROP_CREATOR));
+                assertEquals("cm:creator was wrong", TEST_USER2.getUsername(), node2Props.get(ContentModel.PROP_CREATOR));
+                
+                // content
+                ContentReader reader = CONTENT_SERVICE.getReader(testNode1, ContentModel.PROP_CONTENT);
+                assertNull("Content was unexpectedly present", reader);
+                
+                reader = CONTENT_SERVICE.getReader(testNode2, ContentModel.PROP_CONTENT);
+                assertEquals("Content was wrong", "Hello world", reader.getContentString("Hello world".length()));
+                
+                return null;
+            }
+        });
+    }
+}