diff --git a/test/gstreamer/gstreamer_single_stream_test.cpp b/test/gstreamer/gstreamer_single_stream_test.cpp
index 349dcfa4..80e652eb 100644
--- a/test/gstreamer/gstreamer_single_stream_test.cpp
+++ b/test/gstreamer/gstreamer_single_stream_test.cpp
@@ -41,18 +41,13 @@ protected:
 		 * GStreamer is most likely not, this will cause the ASan link
 		 * order check to fail when gst-plugin-scanner dlopen()s the
 		 * plugin as many libraries will have already been loaded by
-		 * then. Work around this issue by disabling the link order
-		 * check. This will only affect child processes, as ASan is
-		 * already loaded for this process by the time this code is
-		 * executed, and should thus hopefully be safe.
-		 *
-		 * This option is not available in gcc older than 8, the only
-		 * option in that case is to skip the test.
+		 * then. Work around this issue by disabling spawning of a
+		 * child helper process when rebuilding the registry. This will
+		 * only affect child processes, as ASan is already loaded for
+		 * this process by the time this code is executed, and should
+		 * thus hopefully be safe.
 		 */
-#if defined(__SANITIZE_ADDRESS__) && !defined(__clang__) && __GNUC__ < 8
-		return TestSkip;
-#endif
-		setenv("ASAN_OPTIONS", "verify_asan_link_order=0", 1);
+		gst_registry_fork_set_enabled(false);
 
 		/* Initialize GStreamer */
 		g_autoptr(GError) errInit = NULL;