diff --git a/src/util.cc b/src/util.cc
index 4b84cdee7f..11f18f1358 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1186,18 +1186,22 @@ bool have_random_seed()
 unsigned int bro_prng(unsigned int  state)
 	{
 	// Use our own simple linear congruence PRNG to make sure we are
-	// predictable across platforms.
-	static const long int m = 2147483647;
-	static const long int a = 16807;
-	const long int q = m / a;
-	const long int r = m % a;
+	// predictable across platforms.  (Lehmer RNG, Schrage's method)
+	constexpr uint32_t m = 2147483647;
+	constexpr uint32_t a = 16807;
+	constexpr uint32_t q = m / a;
+	constexpr uint32_t r = m % a;
 
-	state = a * ( state % q ) - r * ( state / q );
+	uint32_t rem = state % q;
+	uint32_t div = state / q;
+	int32_t s = a * rem;
+	int32_t t = r * div;
+	int32_t res = s - t;
 
-	if ( state <= 0 )
-		state += m;
+	if ( res < 0 )
+		res += m;
 
-	return state;
+	return res;
 	}
 
 long int bro_random()
diff --git a/testing/btest/Baseline/scripts.base.frameworks.netcontrol.packetfilter/conn.log b/testing/btest/Baseline/scripts.base.frameworks.netcontrol.packetfilter/conn.log
index 336c8ab55f..e6a6ef559d 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.netcontrol.packetfilter/conn.log
+++ b/testing/btest/Baseline/scripts.base.frameworks.netcontrol.packetfilter/conn.log
@@ -3,13 +3,12 @@
 #empty_field	(empty)
 #unset_field	-
 #path	conn
-#open	2019-07-31-22-25-32
+#open	2020-07-22-05-02-04
 #fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	proto	service	duration	orig_bytes	resp_bytes	conn_state	local_orig	local_resp	missed_bytes	history	orig_pkts	orig_ip_bytes	resp_pkts	resp_ip_bytes	tunnel_parents
 #types	time	string	addr	port	addr	port	enum	string	interval	count	count	string	bool	bool	count	string	count	count	count	count	set[string]
 1254722767.492060	CHhAvVGS1DHFjwGM9	10.10.1.4	56166	10.10.1.1	53	udp	dns	0.034025	34	100	SF	-	-	0	Dd	1	62	1	128	-
 1254722776.690444	C4J4Th3PJpwUYZZ6gc	10.10.1.20	138	10.10.1.255	138	udp	-	-	-	-	S0	-	-	0	D	1	229	0	0	-
 1254722767.529046	ClEkJM2Vm5giqnMf4h	10.10.1.4	1470	74.53.140.153	25	tcp	-	0.346950	0	0	S1	-	-	0	Sh	1	48	1	48	-
 1437831776.764391	CtPZjS20MLrsMUOJi2	192.168.133.100	49285	66.196.121.26	5050	tcp	-	0.343008	41	0	OTH	-	-	0	Da	1	93	1	52	-
-1437831798.533765	CmES5u32sYpV7JYN	192.168.133.100	49336	74.125.71.189	443	tcp	-	-	-	-	OTH	-	-	0	A	1	52	0	0	-
-1437831787.856895	CUM0KZ3MLUfNB0cl11	192.168.133.100	49648	192.168.133.102	25	tcp	-	0.048043	162	154	S1	-	-	154	ShDgA	3	192	1	60	-
-#close	2019-07-31-22-25-32
+1437831787.856895	CUM0KZ3MLUfNB0cl11	192.168.133.100	49648	192.168.133.102	25	tcp	-	0.004707	0	0	S1	-	-	0	Sh	1	64	1	60	-
+#close	2020-07-22-05-02-04
diff --git a/testing/btest/bifs/rand.zeek b/testing/btest/bifs/rand.zeek
index 2254cf912a..159f8bc78e 100644
--- a/testing/btest/bifs/rand.zeek
+++ b/testing/btest/bifs/rand.zeek
@@ -32,6 +32,20 @@ event zeek_init()
 	print d;
 	print e;
 	print f;
+
+	local i = 0;
+	local max = 3;
+
+	while ( i < 100 )
+		{
+		local rn = rand(max);
+
+		if ( rn >= max )
+			print fmt("ERROR: rand returned value greater than %s: %s",
+			          max, rn);
+
+		i += 1;
+		}
 	}
 
 event zeek_init() &priority=-10