diff --git a/common/test/Makefile.am b/common/test/Makefile.am
index 23d27a9fcf29479f1d059a69b17eced99b16fd7d..00f1cf5911d4b9d7b412d843761e3e3280436c5c 100644
--- a/common/test/Makefile.am
+++ b/common/test/Makefile.am
@@ -28,6 +28,8 @@ smartpointertest_SOURCES = smartpointertest.cc
 
 tuplestest_SOURCES = tuplestest.cc
 
+streamtest_SOURCES = streamtest.cc
+
 # mention headers so that they are distributed too
 iteratorfacadetest_SOURCES = iteratorfacadetest.cc iteratorfacadetest.hh \
    iteratortest.hh
diff --git a/lib/test/test-stream.cc b/common/test/streamtest.cc
similarity index 100%
rename from lib/test/test-stream.cc
rename to common/test/streamtest.cc
diff --git a/configure.ac b/configure.ac
index 5e59be852debb100402a9ee4b57d3bf995fa95a7..923a5706eedffa65fe0b7b725b93e534a6989235 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,6 @@ AC_CONFIG_FILES([Makefile
 	 io/visual/Makefile
 	 io/visual/grape/Makefile
          lib/Makefile
-         lib/test/Makefile
          operator/Makefile
          quadrature/Makefile
          quadrature/common/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 20f4260f294d3dc2c540052ddb3b6ce43ca53261..70792a01c6919b5f1990c44f5b4ef3ed3ca07f1b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,5 @@
 # $Id$
 
-SUBDIRS = test
-
 # the main library
 lib_LTLIBRARIES = libdune.la
 
diff --git a/lib/test/Makefile.am b/lib/test/Makefile.am
deleted file mode 100644
index 26a6e46c7be8bc730e96fd8c59fc9bc4d4ab698c..0000000000000000000000000000000000000000
--- a/lib/test/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id$
-
-TESTPROGS = test-stream
-
-# which tests to run
-TESTS = $(TESTPROGS)
-
-# programs just to build when "make check" is used
-check_PROGRAMS = $(TESTPROGS)
-
-# we want to check the library, thus link to it :)
-LDADD = ../libdune.la
-
-# define the programs
-
-test_stream_SOURCES = test-stream.cc
-
-include $(top_srcdir)/am/global-rules