diff --git a/Makefile.am b/Makefile.am
index 2ea3aba54..79d054de2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ include $(top_srcdir)/src/backend/Makefile.am
 #include $(top_srcdir)/src...
 
 # tests
+include $(top_srcdir)/tests/components/Makefile.am
 include $(top_srcdir)/tests/Makefile.am
 include $(top_srcdir)/tests/plugin/Makefile.am
 
diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am
new file mode 100644
index 000000000..5e8d1e070
--- /dev/null
+++ b/tests/components/Makefile.am
@@ -0,0 +1,72 @@
+#  Copyright (C)         Lumiera.org
+#    2007,               Christian Thaeter <ct@pipapo.org>
+#                        Hermann Vosseler <Ichthyostega@web.de>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+testcomponents_srcdir = $(top_srcdir)/tests/components
+
+check_PROGRAMS += test-components
+test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(top_srcdir)/src -I$(testcomponents_srcdir)
+test_components_LDADD =								\
+	liblumiproc.a								\
+	liblumiprocengine.a							\
+	liblumiprocmobjectbuilder.a						\
+	liblumiprocmobjectsession.a						\
+	liblumiprocasset.a							\
+	liblumiprocmobject.a							\
+	liblumiprocmobjectcontroller.a						\
+	liblumi.a								\
+	liblumicommon.a								\
+	liblumibackend.a							\
+	-lnobugmt -lpthread -ldl -lboost_program_options-mt -lboost_regex-mt
+
+test_components_SOURCES =							\
+	$(testcomponents_srcdir)/backend/mediaaccessmock.cpp			\
+	$(testcomponents_srcdir)/backend/mediaaccessmocktest.cpp		\
+	$(testcomponents_srcdir)/proc/asset/assetcategorytest.cpp		\
+	$(testcomponents_srcdir)/proc/asset/compoundmediatest.cpp		\
+	$(testcomponents_srcdir)/proc/asset/deleteassettest.cpp			\
+	$(testcomponents_srcdir)/proc/asset/identityofassetstest.cpp		\
+	$(testcomponents_srcdir)/proc/asset/mediastructurequerytest.cpp		\
+	$(testcomponents_srcdir)/proc/asset/basicpipetest.cpp			\
+	$(testcomponents_srcdir)/proc/asset/createassettest.cpp			\
+	$(testcomponents_srcdir)/proc/asset/dependantassetstest.cpp		\
+	$(testcomponents_srcdir)/proc/asset/makecliptest.cpp			\
+	$(testcomponents_srcdir)/proc/asset/orderingofassetstest.cpp		\
+	$(testcomponents_srcdir)/proc/asset/testasset.cpp			\
+	$(testcomponents_srcdir)/proc/engine/sourcenodetest.cpp			\
+	$(testcomponents_srcdir)/proc/mobject/builder/buildertooltest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/builder/buildsegmenttest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/controller/rendersegmenttest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/placementbasictest.cpp		\
+	$(testcomponents_srcdir)/proc/mobject/session/addcliptest.cpp		\
+	$(testcomponents_srcdir)/proc/mobject/session/deletecliptest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/session/rebuildfixturetest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/session/sessionmanagertest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/session/testclip.cpp		\
+	$(testcomponents_srcdir)/proc/mobject/session/defsmanagerimpltest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/session/defsmanagertest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/session/defsregistryimpltest.cpp	\
+	$(testcomponents_srcdir)/proc/mobject/session/sessionstructuretest.cpp	\
+	$(testcomponents_srcdir)/mainsuite.cpp
+
+noinst_HEADERS +=							\
+	$(testcomponents_srcdir)/backend/mediaaccessmock.hpp		\
+	$(testcomponents_srcdir)/proc/asset/testclipasset.hpp		\
+	$(testcomponents_srcdir)/proc/asset/assetdiagnostics.hpp	\
+	$(testcomponents_srcdir)/proc/asset/testasset.hpp		\
+	$(testcomponents_srcdir)/proc/mobject/session/testclip.hpp	\
+	$(testcomponents_srcdir)/proc/mobject/session/testsession1.hpp