diff --git a/core/libs/prx/libSceAgc/CMakeLists.txt b/core/libs/prx/libSceAgc/CMakeLists.txt
index d3bb48f0b..cfcf3e4ac 100644
--- a/core/libs/prx/libSceAgc/CMakeLists.txt
+++ b/core/libs/prx/libSceAgc/CMakeLists.txt
@@ -72,8 +72,9 @@ configure_windows_unwind(agc_command_tests)
 if(BUILD_TESTING)
     set_target_properties(agc_command_tests PROPERTIES EXCLUDE_FROM_ALL OFF)
     add_test(NAME agc_initialization COMMAND agc_command_tests defaults)
+    add_test(NAME agc_commands COMMAND agc_command_tests)
     if(WIN32)
-        set_tests_properties(agc_initialization PROPERTIES ENVIRONMENT_MODIFICATION
+        set_tests_properties(agc_initialization agc_commands PROPERTIES ENVIRONMENT_MODIFICATION
             "PATH=path_list_prepend:$<TARGET_FILE_DIR:libc>")
     endif()
 endif()
diff --git a/core/libs/prx/libSceAgc/tests/Commands.cpp b/core/libs/prx/libSceAgc/tests/Commands.cpp
index 4e11a5bed..592be7022 100644
--- a/core/libs/prx/libSceAgc/tests/Commands.cpp
+++ b/core/libs/prx/libSceAgc/tests/Commands.cpp
@@ -331,8 +331,9 @@ void testMemory() {
     check(packet[8] == 7 && packet[9] == 0x11223344u, "reference patch changed the high word");
     const auto before = storage.words;
     expectFailure([&] { sceAgcWaitRegMemPatchReference(packet, 0x100000000ull); });
-    expectFailure([&] { Agc::Command::WriteWait(&storage.buffer, 0, 3, 0, 0, &value, 0x100000000ull, 0, 32, __func__); });
     check(storage.words == before, "invalid memory operation modified packet memory");
+    auto* truncated = Agc::Command::WriteWait(&storage.buffer, 0, 3, 0, 0, &value, 0x100000000ull, 0xffffffff00000001ull, 32, __func__);
+    check(truncated[8] == 0u && truncated[9] == 1u, "32-bit wait did not keep the low halves of the reference and mask");
 }
 
 void testDefaults() {