diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 831ad9dc0b..4cf0e20412 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -16,7 +16,7 @@ TESTS_ENVIRONMENT = \
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.*
 
-clean-local: clean-local-check
+clean-local: clean-local-check clean-local-orc
 
 $(CHECK_REGISTRY):
 	$(TESTS_ENVIRONMENT)
@@ -81,6 +81,12 @@ else
 check_subparse =
 endif
 
+if HAVE_ORC
+check_orc = orc/adder orc/audioconvert orc/volume orc/videoscale orc/videotestsrc
+else
+check_orc =
+endif
+
 check_PROGRAMS = \
 	$(check_alsa) \
 	$(check_gnomevfs) \
@@ -121,6 +127,7 @@ check_PROGRAMS = \
 	libs/rtp \
 	libs/tag \
 	libs/video \
+	$(check_orc) \
 	pipelines/simple-launch-lines \
 	pipelines/streamheader \
 	pipelines/basetime \
@@ -362,4 +369,39 @@ pipelines_simple_launch_lines_LDADD = \
 	$(GST_BASE_LIBS) \
 	$(LDADD)
 
+orc_adder_CFLAGS = $(ORC_CFLAGS)
+orc_adder_LDADD = $(ORC_LIBS) -lorc-test-0.4
+orc_audioconvert_CFLAGS = $(ORC_CFLAGS)
+orc_audioconvert_LDADD = $(ORC_LIBS) -lorc-test-0.4
+orc_volume_CFLAGS = $(ORC_CFLAGS)
+orc_volume_LDADD = $(ORC_LIBS) -lorc-test-0.4
+orc_videoscale_CFLAGS = $(ORC_CFLAGS)
+orc_videoscale_LDADD = $(ORC_LIBS) -lorc-test-0.4
+orc_videotestsrc_CFLAGS = $(ORC_CFLAGS)
+orc_videotestsrc_LDADD = $(ORC_LIBS) -lorc-test-0.4
+
+orc/adder.c: $(top_srcdir)/gst/adder/gstadderorc.orc
+	$(MKDIR_P) orc/
+	$(ORCC) --test -o $@ $<
+
+orc/audioconvert.c: $(top_srcdir)/gst/audioconvert/gstaudioconvertorc.orc
+	$(MKDIR_P) orc/
+	$(ORCC) --test -o $@ $<
+
+orc/volume.c: $(top_srcdir)/gst/volume/gstvolumeorc.orc
+	$(MKDIR_P) orc/
+	$(ORCC) --test -o $@ $<
+
+orc/videoscale.c: $(top_srcdir)/gst/videoscale/gstvideoscaleorc.orc
+	$(MKDIR_P) orc/
+	$(ORCC) --test -o $@ $<
+
+orc/videotestsrc.c: $(top_srcdir)/gst/videotestsrc/gstvideotestsrcorc.orc
+	$(MKDIR_P) orc/
+	$(ORCC) --test -o $@ $<
+
+
+clean-local-orc:
+	rm -rf orc
+
 EXTRA_DIST = gst-plugins-base.supp