diff --git a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
index 4039edbe91..7d8b5ecd3f 100644
--- a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
@@ -129,7 +129,7 @@ public abstract class BaseWebScriptTest extends TestCase
         throws IOException
     {
         MockHttpServletResponse response = BaseWebScriptTest.getServer().submitRequest(method, url, new HashMap<String, String>(), body, contentType);
-        if (expectedStatus != response.getStatus())
+        if (expectedStatus > 0 && expectedStatus != response.getStatus())
         {
             if (response.getStatus() == 500)
             {
diff --git a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
index e99bf62886..77e042dda8 100644
--- a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
@@ -24,6 +24,9 @@
  */
 package org.alfresco.repo.web.scripts.site;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.alfresco.repo.web.scripts.BaseWebScriptTest;
 import org.alfresco.util.GUID;
 import org.json.JSONArray;
@@ -40,6 +43,23 @@ public class SiteServiceTest extends BaseWebScriptTest
     private static final String URL_SITES = "/api/sites";
     private static final String URL_SITE = "/api/site/";
     
+    private List<String> createdSites = new ArrayList<String>(5);
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // Tidy-up any site's create during the execution of the test
+        for (String shortName : this.createdSites)
+        {
+            deleteRequest(URL_SITE + shortName, 0);
+        }
+        
+        // Clear the list
+        this.createdSites.clear();
+    }
+    
     public void testCreateSite() throws Exception
     {
         String shortName  = GUID.generate();
@@ -65,7 +85,8 @@ public class SiteServiceTest extends BaseWebScriptTest
         site.put("title", title);
         site.put("description", description);
         site.put("isPublic", isPublic);                
-        MockHttpServletResponse response = postRequest(URL_SITES, expectedStatus, site.toString(), "application/json");        
+        MockHttpServletResponse response = postRequest(URL_SITES, expectedStatus, site.toString(), "application/json"); 
+        this.createdSites.add(shortName);
         return new JSONObject(response.getContentAsString());
     }