diff --git a/tests/Makefile.am b/tests/Makefile.am
index 257a9ed1c6..43ac3402a0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,15 @@
 SUBDIRS = sched eos nego muxing
 
-noinst_PROGRAMS = init loadall simplefake states caps queue registry \
-paranoia rip mp3encode autoplug props case4 markup load tee autoplug2 autoplug3 \
-capsconnect padfactory autoplug4 incsched reaping threadlock mp1vid reconnect \
+if GST_DISABLE_LOADSAVE
+GST_LOADSAVE_PROG =
+else
+GST_LOADSAVE_PROG = caps registry autoplug props tee autoplug2 capsconnect \
+		    padfactory autoplug4
+endif
+
+noinst_PROGRAMS = $(GST_LOADSAVE_PROG) init loadall simplefake states queue \
+paranoia rip mp3encode case4 markup load autoplug3 \
+incsched reaping threadlock mp1vid reconnect \
 faketest events timecache
 
 # we have nothing but apps here, we can do this safely
diff --git a/tests/sched/Makefile.am b/tests/sched/Makefile.am
index c1ca8520c6..2894b4ca6d 100644
--- a/tests/sched/Makefile.am
+++ b/tests/sched/Makefile.am
@@ -1,4 +1,8 @@
+if GST_DISABLE_LOADSAVE
+noinst_PROGRAMS =
+else
 noinst_PROGRAMS = runxml
+endif
 
 # nothing but apps here, this is safe
 LIBS += $(GST_LIBS)