diff --git a/test/random_test.cpp b/test/random_test.cpp
index 36882d858..413c70449 100644
--- a/test/random_test.cpp
+++ b/test/random_test.cpp
@@ -29,15 +29,14 @@ TEST(RandomTest, RandomEngineParams)
 		AdvanceRndSeed();
 
 	uint32_t expectedState = 3495122800U;
-	ASSERT_EQ(GetLCGEngineState(), expectedState)
-		<< "Wrong engine state after 10000 invocations";
+	ASSERT_EQ(GetLCGEngineState(), expectedState) << "Wrong engine state after 10000 invocations";
 }
 
-TEST(RandomTest, DefaultDistribution)
+TEST(RandomTest, AbsDistribution)
 {
 	// The default distribution for RNG calls is the absolute value of the generated value interpreted as a signed int
-	// This relies on undefined behaviour. abs(limit<int32_t>::min()) is larger than limit<int32_t>::max(). The
-	// current behaviour is this returns limit<int32_t>::min().
+	// This relies on undefined behaviour when called on std::numeric_limits<int_t>::min(). See C17 7.22.6.1
+	// The current behaviour is this returns the same value (the most negative number of the type).
 	SetRndSeed(1457187811); // yields -2147483648
 	ASSERT_EQ(AdvanceRndSeed(), -2147483648) << "Invalid distribution";
 	SetRndSeed(3604671459U); // yields 0
@@ -74,4 +73,71 @@ TEST(RandomTest, DefaultDistribution)
 	ASSERT_EQ(AdvanceRndSeed(), 2147483647) << "Invalid distribution";
 }
 
+// The bounded distribution function used by Diablo performs a modulo operation on the result of the AbsDistribution
+// tested above, with a shift operation applied before the mod when the bound is < 65535.
+//
+// The current implementation does not allow testing these operations independantly, hopefully this can be changed
+// with confidence from these tests.
+//
+// The result of a mod b when a is negative was implementation defined before C++11, current behaviour is to
+// preserve the sign of a. See C++17 [expr.mul] and C++03 TR1 [expr.mul]
+TEST(RandomTest, ModDistributionInvalidRange)
+{
+	// Calling the modulo distribution with an upper bound <= 0 returns 0 without advancing the engine
+	auto initialSeed = 44444444;
+	SetRndSeed(initialSeed);
+	EXPECT_EQ(GenerateRnd(0), 0) << "A distribution with an upper bound of 0 must return 0";
+	EXPECT_EQ(GetLCGEngineState(), initialSeed) << "Distribution with invalid range must not advance the engine state";
+	EXPECT_EQ(GenerateRnd(-1), 0) << "A distribution with a negative upper bound must return 0";
+	EXPECT_EQ(GetLCGEngineState(), initialSeed) << "Distribution with invalid range must not advance the engine state";
+	EXPECT_EQ(GenerateRnd(std::numeric_limits<int32_t>::min()), 0)
+	    << "A distribution with a negative upper bound must return 0";
+	EXPECT_EQ(GetLCGEngineState(), initialSeed) << "Distribution with invalid range must not advance the engine state";
+}
+
+TEST(RandomTest, ShiftModDistributionSingleRange)
+{
+	// All results mod 1 = 0;
+	auto initialSeed = ::testing::UnitTest::GetInstance()->random_seed();
+	SetRndSeed(initialSeed);
+	for (auto i = 0; i < 100; i++)
+		ASSERT_EQ(GenerateRnd(1), 0) << "Interval [0, 1) must return 0";
+	ASSERT_NE(GetLCGEngineState(), initialSeed) << "Interval of 1 element must still advance the engine state";
+
+	// Just in case -0 has a distinct representation? Shouldn't be possible but cheap to test.
+	SetRndSeed(1457187811);
+	ASSERT_EQ(GenerateRnd(1), 0) << "Interval [0, 1) must return 0 when AbsDistribution yields INT_MIN";
+}
+
+// When called with an upper bound less than 0xFFFF this distribution function discards the low 16 bits of the output
+// from the default distribution by performing a shift right of 16 bits. This relies on implementation defined
+// behaviour for negative numbers, the expectation is shift right uses sign carry. See C++17 [expr.shift]
+TEST(RandomTest, ShiftModDistributionSignCarry)
+{
+	// This distribution is used when the upper bound is a value in [1, 65535)
+	// Using an upper bound of 1 means the result always maps to 0, see RandomTest_ShiftModDistributionSingleRange
+
+	// The only negative value return from AbsDistribution is -2147483648
+	// A sign-preserving shift right of 16 bits gives a result of -32768.
+	SetRndSeed(1457187811); // Test mod with no division
+	ASSERT_EQ(GenerateRnd(65535 - 1), -32768) << "Distribution must map negative numbers using sign carry shifts";
+	SetRndSeed(1457187811); // Test mod when a division occurs
+	ASSERT_EQ(GenerateRnd(32768 - 1), -1) << "Distribution must map negative numbers using sign carry shifts";
+
+	SetRndSeed(3604671459U); // yields 0
+	ASSERT_EQ(GenerateRnd(65534), 0) << "Invalid distribution";
+}
+
+TEST(RandomTest, ModDistributionSignPreserving)
+{
+	// This distribution is used when the upper bound is a value in [65535, 2147483647]
+
+	// Sign preserving modulo when no division is performed cannot be tested in isolation with the current implementation.
+	SetRndSeed(1457187811);
+	ASSERT_EQ(GenerateRnd(65535), -32768) << "Distribution must map negative numbers using sign preserving modulo";
+	SetRndSeed(1457187811);
+	ASSERT_EQ(GenerateRnd(std::numeric_limits<int32_t>::max()), -1)
+	    << "Distribution must map negative numbers using sign preserving modulo";
+}
+
 } // namespace devilution