diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index d3f798ec3a..b84a69a80f 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -331,8 +331,9 @@ def send_evicts(options):
     # 2. The x86 mwait instruction is built on top of coherence invalidations
     # 3. The local exclusive monitor in ARM systems
 
-    if isinstance(options.cpu_type, DerivO3CPU) or ObjectList.cpu_list.get_isa(
-        options.cpu_type
-    ) in [ISA.X86, ISA.ARM]:
+    if (
+        hasattr(m5.objects, "DerivO3CPU")
+        and isinstance(options.cpu_type, DerivO3CPU)
+    ) or ObjectList.cpu_list.get_isa(options.cpu_type) in [ISA.X86, ISA.ARM]:
         return True
     return False
diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc
index a84bf67cd9..e3859ff44c 100644
--- a/src/cpu/testers/memtest/memtest.cc
+++ b/src/cpu/testers/memtest/memtest.cc
@@ -151,7 +151,7 @@ MemTest::completeRequest(PacketPtr pkt, bool functional)
     const uint8_t *pkt_data = pkt->getConstPtr<uint8_t>();
 
     if (pkt->isError()) {
-        if (!functional || !suppressFuncErrors)
+        if (!functional || !pkt->suppressFuncError() || !suppressFuncErrors)
             panic( "%s access failed at %#x\n",
                 pkt->isWrite() ? "Write" : "Read", req->getPaddr());
     } else {
diff --git a/tests/gem5/memory/test.py b/tests/gem5/memory/test.py
index d76463be7b..e049267813 100644
--- a/tests/gem5/memory/test.py
+++ b/tests/gem5/memory/test.py
@@ -70,7 +70,7 @@ gem5_verify_config(
     length=constants.long_tag,
 )
 
-null_tests = [
+x86_tests = [
     ("garnet_synth_traffic", None, ["--sim-cycles", "5000000"]),
     ("memcheck", None, ["--maxtick", "2000000000", "--prefetchers"]),
     (
@@ -122,7 +122,7 @@ null_tests = [
     ("ruby_direct_test", None, ["--requests", "50000"]),
 ]
 
-for test_name, basename_noext, args in null_tests:
+for test_name, basename_noext, args in x86_tests:
     if basename_noext == None:
         basename_noext = test_name
     gem5_verify_config(
@@ -133,7 +133,8 @@ for test_name, basename_noext, args in null_tests:
             config.base_dir, "configs", "example", basename_noext + ".py"
         ),
         config_args=args,
-        valid_isas=(constants.null_tag,),
+        valid_isas=(constants.x86_tag,),
+        protocol="MESI_Two_Level",
         valid_hosts=constants.supported_hosts,
         length=constants.long_tag,
     )