diff --git a/CHANGES b/CHANGES
index 5c9f39755..fe416bcb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -49,6 +49,7 @@ Bugfixes:
  - GBA Hardware: Fix crash if a savestate lies about game hardware
  - Test: Fix crash when fuzzing fails to load a file
  - GBA: Fix multiboot loading resulting in too small WRAM
+ - Test: Don't rely on core for frames elapsed
 Misc:
  - SDL: Remove scancode key input
  - GBA Video: Clean up unused timers
diff --git a/src/platform/test/fuzz-main.c b/src/platform/test/fuzz-main.c
index 7e86ec914..533866155 100644
--- a/src/platform/test/fuzz-main.c
+++ b/src/platform/test/fuzz-main.c
@@ -176,9 +176,10 @@ loadError:
 static void _fuzzRunloop(struct mCore* core, int frames) {
 	do {
 		core->runFrame(core);
+		--frames;
 		blip_clear(core->getAudioChannel(core, 0));
 		blip_clear(core->getAudioChannel(core, 1));
-	} while (core->frameCounter(core) < frames && !_dispatchExiting);
+	} while (frames > 0 && !_dispatchExiting);
 }
 
 static void _fuzzShutdown(int signal) {