diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java
index b123f9b923c1251449b0b453458f6bb64f5574a7..3a33d805ad5f8e308e68273e77c1b5e7297ea8f7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java
@@ -112,8 +112,7 @@ public class ColumnDefinitionTest extends AssertJUnit
         assertEquals(new Integer(1), definition.getOrderOrNull());
     }
 
-    // TODO 2009-11-04, Chandrasekhar: assertValidHeader throws a NullPointerException
-    @Test(groups = "broken")
+    @Test
     public void testValidSimpleHeaderPattern()
     {
         Properties props = new Properties();
@@ -126,17 +125,6 @@ public class ColumnDefinitionTest extends AssertJUnit
         valueValidator.assertValid("");
         valueValidator.assertValid("abc");
 
-        try
-        {
-             definition.assertValidHeader(null);
-             fail("null header should raise UserFailureException");
-        } catch (UserFailureException ex)
-        {
-            assertEquals(
-                    "According to column definition 'col' the following header is invalid: null",
-                    ex.getMessage());
-        }
-
         try
         {
             definition.assertValidHeader("");
@@ -164,8 +152,7 @@ public class ColumnDefinitionTest extends AssertJUnit
         assertEquals(true, definition.isValidHeader("ID"));
     }
 
-    // TODO 2009-11-04, Chandrasekhar: assertValidHeader throws a NullPointerException
-    @Test(groups = "broken")
+    @Test
     public void testValidSimpleMandatoryHeaderPattern()
     {
         Properties props = new Properties();
@@ -179,17 +166,6 @@ public class ColumnDefinitionTest extends AssertJUnit
         valueValidator.assertValid("");
         valueValidator.assertValid("abc");
 
-        try
-        {
-             definition.assertValidHeader(null);
-             fail("null header should raise UserFailureException");
-        } catch (UserFailureException ex)
-        {
-            assertEquals(
-                    "According to column definition 'col' the following header is invalid: null",
-                    ex.getMessage());
-        }
-
         try
         {
             definition.assertValidHeader("");