diff --git a/check/Makefile.am b/check/Makefile.am
index b1703db3e8..39c5873a36 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -8,7 +8,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
         CK_DEFAULT_TIMEOUT=20                                   \
 	$(REGISTRY_ENVIRONMENT)					\
-	GST_PLUGIN_PATH_ONLY=yes				\
+	GST_PLUGIN_PATH_SYSTEM=					\
 	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GST_PLUGINS_DIR)
 
 # ths core dumps of some machines have PIDs appended
@@ -17,11 +17,9 @@ CLEANFILES = core.* test-registry.xml
 clean-local: clean-local-check
 
 $(CHECK_REGISTRY):
-	$(TESTS_ENVIRONMENT)					\
-	$(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@
+	$(TESTS_ENVIRONMENT)
 
-TESTS = $(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@		\
-	$(check_PROGRAMS)
+TESTS = $(check_PROGRAMS)
 
 if USE_VORBIS
 check_vorbis = elements/vorbisdec
@@ -45,7 +43,6 @@ AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
 # valgrind testing
-VALGRIND_TESTS_DISABLE = 			\
-	$(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@
+VALGRIND_TESTS_DISABLE =
 
 SUPPRESSIONS = $(top_srcdir)/common/gst.supp
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index b1703db3e8..39c5873a36 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -8,7 +8,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
         CK_DEFAULT_TIMEOUT=20                                   \
 	$(REGISTRY_ENVIRONMENT)					\
-	GST_PLUGIN_PATH_ONLY=yes				\
+	GST_PLUGIN_PATH_SYSTEM=					\
 	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GST_PLUGINS_DIR)
 
 # ths core dumps of some machines have PIDs appended
@@ -17,11 +17,9 @@ CLEANFILES = core.* test-registry.xml
 clean-local: clean-local-check
 
 $(CHECK_REGISTRY):
-	$(TESTS_ENVIRONMENT)					\
-	$(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@
+	$(TESTS_ENVIRONMENT)
 
-TESTS = $(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@		\
-	$(check_PROGRAMS)
+TESTS = $(check_PROGRAMS)
 
 if USE_VORBIS
 check_vorbis = elements/vorbisdec
@@ -45,7 +43,6 @@ AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
 # valgrind testing
-VALGRIND_TESTS_DISABLE = 			\
-	$(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@
+VALGRIND_TESTS_DISABLE =
 
 SUPPRESSIONS = $(top_srcdir)/common/gst.supp