diff --git a/ant_tasks/sourceTest/java/tests.xml b/ant_tasks/sourceTest/java/tests.xml
index 9cdd46f7dec1379be3b86ebf756b360f80b9d347..cc7e09e81c0df14eb35cbbeb34dcdba7a78d2c91 100644
--- a/ant_tasks/sourceTest/java/tests.xml
+++ b/ant_tasks/sourceTest/java/tests.xml
@@ -1,7 +1,12 @@
-<suite name="All" verbose="1" >
-  <test name="All" >
-    <packages>
-      <package name="ch.systemsx.*" />
-   </packages>
- </test>
+<suite name="All" verbose="1">
+    <test name="All">
+        <groups>
+            <run>
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.systemsx.*" />
+        </packages>
+    </test>
 </suite>
diff --git a/authentication/sourceTest/java/tests.xml b/authentication/sourceTest/java/tests.xml
index b764066748c2416c1821135fdd9cdc6e7b142d32..66b22daf635cbcb82fa3550fa22f385664748ffd 100644
--- a/authentication/sourceTest/java/tests.xml
+++ b/authentication/sourceTest/java/tests.xml
@@ -1,7 +1,12 @@
-<suite name="All" verbose="1" >
-  <test name="All" >
-    <packages>
-      <package name="ch.systemsx.cisd.authentication.*" />
-   </packages>
- </test>
+<suite name="All" verbose="1">
+    <test name="All">
+        <groups>
+            <run>
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.systemsx.cisd.authentication.*" />
+        </packages>
+    </test>
 </suite>
diff --git a/bds/sourceTest/java/tests.xml b/bds/sourceTest/java/tests.xml
index defefd952a29a76941a9a87cb27fd506f54fa03f..5e3c7bab346ff1b8abb5346e59d40c924b6c9f0c 100644
--- a/bds/sourceTest/java/tests.xml
+++ b/bds/sourceTest/java/tests.xml
@@ -1,7 +1,12 @@
-<suite name="All" verbose="1" >
-  <test name="All" >
-    <packages>
-      <package name="ch.systemsx.cisd.bds.*" />
-   </packages>
- </test>
+<suite name="All" verbose="1">
+    <test name="All">
+        <groups>
+            <run>
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.systemsx.cisd.bds.*" />
+        </packages>
+    </test>
 </suite>
diff --git a/common/sourceTest/java/tests.xml b/common/sourceTest/java/tests.xml
index 9cdd46f7dec1379be3b86ebf756b360f80b9d347..cc7e09e81c0df14eb35cbbeb34dcdba7a78d2c91 100644
--- a/common/sourceTest/java/tests.xml
+++ b/common/sourceTest/java/tests.xml
@@ -1,7 +1,12 @@
-<suite name="All" verbose="1" >
-  <test name="All" >
-    <packages>
-      <package name="ch.systemsx.*" />
-   </packages>
- </test>
+<suite name="All" verbose="1">
+    <test name="All">
+        <groups>
+            <run>
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.systemsx.*" />
+        </packages>
+    </test>
 </suite>
diff --git a/datamover/sourceTest/java/tests.xml b/datamover/sourceTest/java/tests.xml
index 9cdd46f7dec1379be3b86ebf756b360f80b9d347..cc7e09e81c0df14eb35cbbeb34dcdba7a78d2c91 100644
--- a/datamover/sourceTest/java/tests.xml
+++ b/datamover/sourceTest/java/tests.xml
@@ -1,7 +1,12 @@
-<suite name="All" verbose="1" >
-  <test name="All" >
-    <packages>
-      <package name="ch.systemsx.*" />
-   </packages>
- </test>
+<suite name="All" verbose="1">
+    <test name="All">
+        <groups>
+            <run>
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.systemsx.*" />
+        </packages>
+    </test>
 </suite>
diff --git a/datamover/sourceTest/java/tests_fast.xml b/datamover/sourceTest/java/tests_fast.xml
index 3faf21054ecbd008735d72cc38f65694610c4541..b7b553f846185c9881c6a15be0f620a118f85f6b 100644
--- a/datamover/sourceTest/java/tests_fast.xml
+++ b/datamover/sourceTest/java/tests_fast.xml
@@ -1,15 +1,15 @@
- <!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
 
-<suite name="Fast" verbose="1" >
-  <test name="Fast" >
-    <groups>
-      <run>
-        <exclude name="slow" />
-      </run>
-    </groups>
-
-    <packages>
-      <package name="ch.systemsx.*" />
-    </packages>
-  </test>
+<suite name="Fast" verbose="1">
+    <test name="Fast">
+        <groups>
+            <run>
+                <exclude name="slow" />
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.systemsx.*" />
+        </packages>
+    </test>
 </suite>
diff --git a/dbmigration/sourceTest/java/tests.xml b/dbmigration/sourceTest/java/tests.xml
index 9cdd46f7dec1379be3b86ebf756b360f80b9d347..cc7e09e81c0df14eb35cbbeb34dcdba7a78d2c91 100644
--- a/dbmigration/sourceTest/java/tests.xml
+++ b/dbmigration/sourceTest/java/tests.xml
@@ -1,7 +1,12 @@
-<suite name="All" verbose="1" >
-  <test name="All" >
-    <packages>
-      <package name="ch.systemsx.*" />
-   </packages>
- </test>
+<suite name="All" verbose="1">
+    <test name="All">
+        <groups>
+            <run>
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.systemsx.*" />
+        </packages>
+    </test>
 </suite>