diff --git a/test/columns.t b/test/columns.t
index 12bdf4811..ede57e498 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -241,16 +241,16 @@ class TestRecurringAttributeFormats(TestCase):
         """Executed before each test in the class"""
 
     def test_recurrence_formats_short(self):
-        """Verify formatting of assorted recurrence columns"""
+        """Verify formatting of assorted short recurrence columns"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,status,due,recur.indicator,mask,imask,parent.short")
         self.assertRegexpMatches(out, "1\sRecurring\s+\d{4}-\d{2}-\d{2}\s+R\s+-")
         self.assertRegexpMatches(out, "2\sPending\s+\d{4}-\d{2}-\d{2}\s+R\s+0\s+[0-9a-fA-F]{8}")
 
     def test_recurrence_formats_long(self):
-        """Verify formatting of assorted recurrence columns"""
+        """Verify formatting of assorted long recurrence columns"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,status,due,recur.duration,mask,imask,parent.long")
-        self.assertRegexpMatches(out, "1\sRecurring\s+\d{4}-\d{2}-\d{2}\s+P1M\s+-")
-        self.assertRegexpMatches(out, "2\sPending\s+\d{4}-\d{2}-\d{2}\s+P1M\s+0\s+[0-9a-fA-F-]{36}")
+        self.assertRegexpMatches(out, "1\sRecurring\s+\d{4}-\d{2}-\d{2}\s+P30D\s+-")
+        self.assertRegexpMatches(out, "2\sPending\s+\d{4}-\d{2}-\d{2}\s+P30D\s+0\s+[0-9a-fA-F-]{36}")
 
     def test_recurrence_format_unrecognized(self):
         """Verify *.donkey formatting fails"""
@@ -379,7 +379,7 @@ class TestDateFormats(TestCase):
         """Verify due.remaining formatting"""
         code, out, err = self.t("xxx rc.report.xxx.columns:id,due.remaining")
         self.assertRegexpMatches(out, r'1')
-        self.assertRegexpMatches(out, r'2\s+\d+ \S+')
+        self.assertRegexpMatches(out, r'2\s+\d+\S+')
 
     def test_date_format_countdown(self):
         """Verify due.countdown formatting"""