diff --git a/src/cpu/testers/gpu_ruby_test/ProtocolTester.py b/src/cpu/testers/gpu_ruby_test/ProtocolTester.py
index 178376bee9..c314392520 100644
--- a/src/cpu/testers/gpu_ruby_test/ProtocolTester.py
+++ b/src/cpu/testers/gpu_ruby_test/ProtocolTester.py
@@ -73,7 +73,7 @@ class ProtocolTester(ClockedObject):
     random_seed = Param.Int(
         0,
         "Random seed number. Default value (0) means \
-                                using runtime-specific value.",
+                                using base/random.hh without seed.",
     )
     log_file = Param.String("Log file's name")
     system = Param.System(Parent.any, "System we belong to")
diff --git a/src/cpu/testers/gpu_ruby_test/address_manager.cc b/src/cpu/testers/gpu_ruby_test/address_manager.cc
index 049ba86e51..a0c0670a8f 100644
--- a/src/cpu/testers/gpu_ruby_test/address_manager.cc
+++ b/src/cpu/testers/gpu_ruby_test/address_manager.cc
@@ -33,7 +33,6 @@
 
 #include <algorithm>
 #include <climits>
-#include <random>
 
 #include "base/intmath.hh"
 #include "base/logging.hh"
@@ -101,7 +100,8 @@ AddressManager::getAddress(Location loc)
 AddressManager::Location
 AddressManager::getAtomicLoc()
 {
-    Location ret_atomic_loc = random() % numAtomicLocs;
+    Location ret_atomic_loc = \
+        random_mt.random<unsigned long>() % numAtomicLocs;
     atomicStructs[ret_atomic_loc]->startLocSelection();
     return ret_atomic_loc;
 }
@@ -206,7 +206,9 @@ AddressManager::AtomicStruct::getLoadLoc()
         // we can pick any location btw
         // locArray [firstMark : arraySize-1]
         int range_size = arraySize - firstMark;
-        Location ret_loc = locArray[firstMark + random() % range_size];
+        Location ret_loc = locArray[
+                firstMark + random_mt.random<unsigned int>() % range_size
+        ];
 
         // update loadStoreMap
         LdStMap::iterator it = loadStoreMap.find(ret_loc);
@@ -238,7 +240,9 @@ AddressManager::AtomicStruct::getStoreLoc()
     } else {
         // we can pick any location btw [firstMark : secondMark-1]
         int range_size = secondMark - firstMark;
-        Location ret_loc = locArray[firstMark + random() % range_size];
+        Location ret_loc = locArray[
+            firstMark + random_mt.random<unsigned int>() % range_size
+        ];
 
         // update loadStoreMap
         LdStMap::iterator it = loadStoreMap.find(ret_loc);
diff --git a/src/cpu/testers/gpu_ruby_test/episode.cc b/src/cpu/testers/gpu_ruby_test/episode.cc
index 6822049bbd..7e16b0ef07 100644
--- a/src/cpu/testers/gpu_ruby_test/episode.cc
+++ b/src/cpu/testers/gpu_ruby_test/episode.cc
@@ -34,6 +34,7 @@
 #include <fstream>
 #include <unordered_set>
 
+#include "base/random.hh"
 #include "cpu/testers/gpu_ruby_test/protocol_tester.hh"
 #include "cpu/testers/gpu_ruby_test/tester_thread.hh"
 
@@ -100,7 +101,7 @@ Episode::initActions()
     int num_loads = numLoads;
     int num_stores = numStores;
     while ((num_loads + num_stores) > 0) {
-        switch (random() % 2) {
+        switch (random_mt.random<unsigned int>() % 2) {
             case 0: // Load
                 if (num_loads > 0) {
                     actions.push_back(new Action(Action::Type::LOAD,
diff --git a/src/cpu/testers/gpu_ruby_test/protocol_tester.cc b/src/cpu/testers/gpu_ruby_test/protocol_tester.cc
index f2fd7f9600..fdf30304f1 100644
--- a/src/cpu/testers/gpu_ruby_test/protocol_tester.cc
+++ b/src/cpu/testers/gpu_ruby_test/protocol_tester.cc
@@ -34,8 +34,8 @@
 #include <algorithm>
 #include <ctime>
 #include <fstream>
-#include <random>
 
+#include "base/random.hh"
 #include "cpu/testers/gpu_ruby_test/cpu_thread.hh"
 #include "cpu/testers/gpu_ruby_test/dma_thread.hh"
 #include "cpu/testers/gpu_ruby_test/gpu_wavefront.hh"
@@ -141,11 +141,11 @@ ProtocolTester::ProtocolTester(const Params &p)
 
     sentExitSignal = false;
 
-    // set random seed number
+    // set random seed number, if specified.
+    // Note: random_m5 will use a fixed key if random_seed is not set.
+    // This ensures a reproducable.
     if (p.random_seed != 0) {
-        srand(p.random_seed);
-    } else {
-        srand(time(NULL));
+        random_mt.init(p.random_seed);
     }
 
     actionCount = 0;
diff --git a/src/cpu/testers/gpu_ruby_test/tester_thread.cc b/src/cpu/testers/gpu_ruby_test/tester_thread.cc
index 760f8c2d87..ce3a1bccc6 100644
--- a/src/cpu/testers/gpu_ruby_test/tester_thread.cc
+++ b/src/cpu/testers/gpu_ruby_test/tester_thread.cc
@@ -33,6 +33,7 @@
 
 #include <fstream>
 
+#include "base/random.hh"
 #include "debug/ProtocolTest.hh"
 
 namespace gem5
@@ -144,7 +145,8 @@ TesterThread::attachTesterThreadToPorts(ProtocolTester *_tester,
 void
 TesterThread::issueNewEpisode()
 {
-    int num_reg_loads = random() % tester->getEpisodeLength();
+    int num_reg_loads = \
+        random_mt.random<unsigned int>() % tester->getEpisodeLength();
     int num_reg_stores = tester->getEpisodeLength() - num_reg_loads;
 
     // create a new episode