diff --git a/src/Attr.cc b/src/Attr.cc
index 9a446fb763..351a360618 100644
--- a/src/Attr.cc
+++ b/src/Attr.cc
@@ -20,8 +20,8 @@ const char* attr_name(AttrTag t)
 		"&read_expire", "&write_expire", "&create_expire",
 		"&raw_output", "&priority",
 		"&group", "&log", "&error_handler", "&type_column",
-	    "(&tracked)", "&on_change", "&broker_store",
-	    "&broker_allow_complex_type", "&backend", "&deprecated",
+		"(&tracked)", "&on_change", "&broker_store",
+		"&broker_allow_complex_type", "&backend", "&deprecated",
 	};
 
 	return attr_names[int(t)];
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index cc689bbf90..4ba4a34aef 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -921,7 +921,9 @@ void Manager::Process()
 	{
 	// Ensure that time gets update before processing broker messages, or events
 	// based on them might get scheduled wrong.
-	net_update_time(current_time());
+	// Fixme: unclear if final solution - see https://github.com/zeek/broker/issues/135
+	if ( use_real_time )
+		net_update_time(current_time());
 
 	bool had_input = false;
 
diff --git a/testing/btest/broker/store/brokerstore-attr-expire.zeek b/testing/btest/broker/store/brokerstore-attr-expire.zeek
index be58d3e005..42408fb740 100644
--- a/testing/btest/broker/store/brokerstore-attr-expire.zeek
+++ b/testing/btest/broker/store/brokerstore-attr-expire.zeek
@@ -1,10 +1,18 @@
+# So - this test currently is not really that great. The goal was to test expiration after
+# syncing values with broker. However, it turns out that the delays introduced by broker seem
+# a bit random - and too high to really test this without the test taking forever.
+#
+# so - instead we just check that expiries do indeed happen - however the ordering is not as
+# guaranteed as I would have liked to have it.
+
+
 # @TEST-PORT: BROKER_PORT
 
 # @TEST-EXEC: btest-bg-run master "zeek -B broker -b ../master.zeek >../master.out"
 # @TEST-EXEC: btest-bg-run clone "zeek -B broker -b ../clone.zeek >../clone.out"
 # @TEST-EXEC: btest-bg-wait 20
 #
-# @TEST-EXEC: btest-diff clone.out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff clone.out
 
 @TEST-START-FILE master.zeek
 redef exit_only_after_terminate = T;