diff --git a/t/22-transit-visibility.t b/t/22-transit-visibility.t
index 90f57d1aa9fd1b8815b13e02b0b69bb39929da81..8a68f5cb94de37b9b80a5e83c5cda4d768fbec50 100644
--- a/t/22-transit-visibility.t
+++ b/t/22-transit-visibility.t
@@ -108,10 +108,10 @@ sub test_intransit_visibility {
 		$opt{effective_visibility_str}, $desc );
 
 	if ( $opt{public} ) {
-		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
 		$t->get_ok('/ajax/status/test1.html')->status_is(200)
-		  ->content_like(qr{DPN 667});
-		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
+		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok('/status/test1')->status_is(200)
@@ -124,9 +124,9 @@ sub test_intransit_visibility {
 
 	if ( $opt{with_token} ) {
 		$t->get_ok("/status/test1/$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/status/test1/$token")->status_is(200)
@@ -142,10 +142,10 @@ sub test_intransit_visibility {
 
 	# users can see their own status if visibility is >= followrs
 	if ( $opt{effective_visibility} >= 60 ) {
-		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
 		$t->get_ok('/ajax/status/test1.html')->status_is(200)
-		  ->content_like(qr{DPN 667});
-		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
+		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok('/status/test1')->status_is(200)
@@ -159,9 +159,9 @@ sub test_intransit_visibility {
 	# users can see their own status with token if visibility is >= unlisted
 	if ( $opt{effective_visibility} >= 30 ) {
 		$t->get_ok("/status/test1/$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/status/test1/$token")->status_is(200)
@@ -178,10 +178,10 @@ sub test_intransit_visibility {
 
 	# uid2 can see uid1 if visibility is >= followers
 	if ( $opt{effective_visibility} >= 60 ) {
-		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
 		$t->get_ok('/ajax/status/test1.html')->status_is(200)
-		  ->content_like(qr{DPN 667});
-		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
+		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok('/status/test1')->status_is(200)
@@ -195,9 +195,9 @@ sub test_intransit_visibility {
 	# uid2 can see uid1 with token if visibility is >= unlisted
 	if ( $opt{effective_visibility} >= 30 ) {
 		$t->get_ok("/status/test1/$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/status/test1/$token")->status_is(200)
@@ -214,10 +214,10 @@ sub test_intransit_visibility {
 
 	# uid3 can see uid1 if visibility is >= travelynx
 	if ( $opt{effective_visibility} >= 80 ) {
-		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN 667});
+		$t->get_ok('/status/test1')->status_is(200)->content_like(qr{DPN\s*667});
 		$t->get_ok('/ajax/status/test1.html')->status_is(200)
-		  ->content_like(qr{DPN 667});
-		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
+		$t->get_ok('/p/test1')->status_is(200)->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok('/status/test1')->status_is(200)
@@ -231,9 +231,9 @@ sub test_intransit_visibility {
 	# uid3 can see uid1 with token if visibility is >= unlisted
 	if ( $opt{effective_visibility} >= 30 ) {
 		$t->get_ok("/status/test1/$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 		$t->get_ok("/ajax/status/test1.html?token=$j_token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/status/test1/$token")->status_is(200)
diff --git a/t/23-journey-visibility.t b/t/23-journey-visibility.t
index 58b305ab3da2c7c79bf3ba63e4f25eeded272c30..1cc7e642d6c5d594a1b98cdd167ea9ed81aaab0b 100644
--- a/t/23-journey-visibility.t
+++ b/t/23-journey-visibility.t
@@ -111,7 +111,7 @@ sub test_journey_visibility {
 
 	if ( $opt{public} ) {
 		$t->get_ok("/p/test1/j/$jid")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -120,7 +120,7 @@ sub test_journey_visibility {
 
 	if ( $opt{with_token} ) {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
@@ -135,7 +135,7 @@ sub test_journey_visibility {
 	# users can see their own status if visibility is >= followrs
 	if ( $opt{effective_visibility} >= 60 ) {
 		$t->get_ok("/p/test1/j/$jid")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -145,7 +145,7 @@ sub test_journey_visibility {
 	# users can see their own status with token if visibility is >= unlisted
 	if ( $opt{effective_visibility} >= 30 ) {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
@@ -161,7 +161,7 @@ sub test_journey_visibility {
 	# uid2 can see uid1 if visibility is >= followers
 	if ( $opt{effective_visibility} >= 60 ) {
 		$t->get_ok("/p/test1/j/$jid")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -171,7 +171,7 @@ sub test_journey_visibility {
 	# uid2 can see uid1 with token if visibility is >= unlisted
 	if ( $opt{effective_visibility} >= 30 ) {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
@@ -187,7 +187,7 @@ sub test_journey_visibility {
 	# uid3 can see uid1 if visibility is >= travelynx
 	if ( $opt{effective_visibility} >= 80 ) {
 		$t->get_ok("/p/test1/j/$jid")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid")->status_is(404)
@@ -197,7 +197,7 @@ sub test_journey_visibility {
 	# uid3 can see uid1 with token if visibility is >= unlisted
 	if ( $opt{effective_visibility} >= 30 ) {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(200)
-		  ->content_like(qr{DPN 667});
+		  ->content_like(qr{DPN\s*667});
 	}
 	else {
 		$t->get_ok("/p/test1/j/$jid$token")->status_is(404)
diff --git a/t/24-past-visibility.t b/t/24-past-visibility.t
index 935ab6c912bef95575d79cc62ef90f6c1a55bd98..cf981b99959dfd7edc9995fc12bf9c6da9facbef 100644
--- a/t/24-past-visibility.t
+++ b/t/24-past-visibility.t
@@ -116,11 +116,11 @@ sub test_history_visibility {
 
 	if ( $opt{public} ) {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_like( qr{DPN 667}, "public $desc" );
+		  ->content_like( qr{DPN\s*667}, "public $desc" );
 	}
 	else {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_unlike( qr{DPN 667}, "public $desc" );
+		  ->content_unlike( qr{DPN\s*667}, "public $desc" );
 	}
 
 	login(
@@ -130,11 +130,11 @@ sub test_history_visibility {
 
 	if ( $opt{self} ) {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_like( qr{DPN 667}, "self $desc" );
+		  ->content_like( qr{DPN\s*667}, "self $desc" );
 	}
 	else {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_unlike( qr{DPN 667}, "self $desc" );
+		  ->content_unlike( qr{DPN\s*667}, "self $desc" );
 	}
 
 	logout();
@@ -145,11 +145,11 @@ sub test_history_visibility {
 
 	if ( $opt{followers} ) {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_like( qr{DPN 667}, "follower $desc" );
+		  ->content_like( qr{DPN\s*667}, "follower $desc" );
 	}
 	else {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_unlike( qr{DPN 667}, "follower $desc" );
+		  ->content_unlike( qr{DPN\s*667}, "follower $desc" );
 	}
 
 	logout();
@@ -160,11 +160,11 @@ sub test_history_visibility {
 
 	if ( $opt{travelynx} ) {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_like( qr{DPN 667}, "travelynx $desc" );
+		  ->content_like( qr{DPN\s*667}, "travelynx $desc" );
 	}
 	else {
 		$t->get_ok('/p/test1')->status_is(200)
-		  ->content_unlike( qr{DPN 667}, "travelynx $desc" );
+		  ->content_unlike( qr{DPN\s*667}, "travelynx $desc" );
 	}
 
 	logout();