diff --git a/source/java/org/alfresco/repo/cluster/BuildSafeTestSuite.java b/source/java/org/alfresco/repo/cluster/BuildSafeTestSuite.java
new file mode 100644
index 0000000000..13f39e6b37
--- /dev/null
+++ b/source/java/org/alfresco/repo/cluster/BuildSafeTestSuite.java
@@ -0,0 +1,44 @@
+/*
+ * 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.repo.cluster;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Test suite for org.alfresco.repo.cluster tests, but <strong>excluding</strong>
+ * tests which are known to fail in the CI environment (Bamboo).
+ * <p>
+ * These tests are still useful in the desktop development environment however,
+ * so are kept for this reason. {@link ClusterTestSuite} runs all the tests in this
+ * suite, plus the offending tests.
+ * 
+ * @author Matt Ward
+ */
+@RunWith(Suite.class)
+@SuiteClasses({
+    org.alfresco.repo.cluster.HazelcastMessengerFactoryTest.class,
+    org.alfresco.repo.cluster.HazelcastMessengerTest.class,
+    org.alfresco.repo.cluster.JGroupsMessengerTest.class
+})
+public class BuildSafeTestSuite
+{
+    // Annotations specify the suite.
+}
diff --git a/source/java/org/alfresco/repo/cluster/ClusterTestSuite.java b/source/java/org/alfresco/repo/cluster/ClusterTestSuite.java
index 22f92113d4..591868be84 100644
--- a/source/java/org/alfresco/repo/cluster/ClusterTestSuite.java
+++ b/source/java/org/alfresco/repo/cluster/ClusterTestSuite.java
@@ -24,15 +24,19 @@ import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * Test suite for the org.alfresco.repo.cluster package.
+ * <p>
+ * This includes tests which will <strong>fail</strong> on the build servers -
+ * do not include this suite in the CI build targets.
  * 
  * @author Matt Ward
  */
 @RunWith(Suite.class)
 @SuiteClasses({
-    org.alfresco.repo.cluster.HazelcastMessengerFactoryTest.class,
-    org.alfresco.repo.cluster.HazelcastMessengerTest.class,
+    // Run the standard tests
+    org.alfresco.repo.cluster.BuildSafeTestSuite.class,
+    
+    // Additionally run these tests that cannot be run on the build servers.
     org.alfresco.repo.cluster.HazelcastTest.class,
-    org.alfresco.repo.cluster.JGroupsMessengerTest.class,
     org.alfresco.repo.cluster.JGroupsTest.class
 })
 public class ClusterTestSuite