Index: branches/cname-collision/t/cname.t
===================================================================
--- branches/cname-collision/t/cname.t	(revision 1000)
+++ branches/cname-collision/t/cname.t	(revision 1001)
@@ -313,16 +313,10 @@
       $newname = 'expires-at5.expiry2.test';
       ($code, $msg) = $dnsdb->addRec('n', 'n', 5, \$newname, \$rectype, \$newval, 900, undef, 't', $expirystamp);
-      ok( $code eq 'OK', "addRec() claimed success" );
-      if ($code eq 'OK') {
+      cmp_ok( $code, 'eq', 'FAIL', "addRec() claimed failure" );
+      if ($code eq 'FAIL') {
         # crosscheck in the DB
         ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 5 AND host = '$newname'");
-        ok( $rcount == 2, " ... [$rcount] correct number of records for $newname" );
-        my ($newstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 5 AND host = '$newname' ".
-		"AND stampactive = 't' AND expires = 't' AND stamp >= now()");
-        my ($oldstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 5 AND host = '$newname' ".
-		"AND stampactive = 't' AND expires = 't' AND stamp <= now()");
-        ok( $newstamp > $oldstamp, " ... added record expires after existing, already-expired record" );
-      } else {
-        print "not ok: $msg";
+        ok( $rcount == 1, " ... [$rcount] correct number of records for $newname" );
+        like( $msg, qr/non-CNAME records with timestamps already exist/, " ... returned matching error" );
       }
     };