diff --git a/configure.ac b/configure.ac
index 7d75ac68..cb493d04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,6 +660,7 @@ AC_CONFIG_FILES([
        src/cd-paranoia/doc/ja/cd-paranoia.1 \
        src/cd-paranoia/doc/ja/Makefile \
        src/Makefile \
+       test/driver/Makefile \
        test/testbincue.c \
        test/testgetdevices.c \
        test/testisocd2.c \
diff --git a/include/cdio/version.h.in b/include/cdio/version.h.in
index 9f68c241..bc21f1e4 100644
--- a/include/cdio/version.h.in
+++ b/include/cdio/version.h.in
@@ -11,9 +11,10 @@
 #define CDIO_VERSION "@VERSION@ @build@"
 extern const char *cdio_version_string; /**< = CDIO_VERSION */
 
-/*! LIBCDIO_VERSION_NUM can be used for testing in the C preprocessor,
-    libcdio_version_num has the same value, but it is a constant variable
-    that can be accessed at run time.  */
+/*! LIBCDIO_VERSION_NUM is a C-Preprocessor macro that can be used for
+    testing in the C preprocessor. libcdio_version_num has the same
+    value, but it is a constant variable that can be accessed at run
+    time.  */
 #define LIBCDIO_VERSION_NUM @LIBCDIO_VERSION_NUM@
 
 extern const unsigned int libcdio_version_num; /**< = LIBCDIO_VERSION_NUM */
diff --git a/test/Makefile.am b/test/Makefile.am
index 19777e61..553a6dd0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,14 +21,16 @@
 # There's a problem with doing make distcheck for testdefault. 
 # A reminder of why I hate automake.
 
+SUBDIRS = driver
+
 if BUILD_CD_PARANOIA
 testparanoia=testparanoia
 testparanoia_LDADD = $(LIBCDIO_PARANOIA_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 endif
 
 hack = check_sizeof testassert testbincue testgetdevices testischar \
-       testisocd testisocd2 testiso9660 testlinux test_lib_driver_util \
-       testnrg $(testparanoia) testtoc testpregap testsolaris
+       testisocd testisocd2 testiso9660 test_lib_driver_util \
+       testnrg $(testparanoia) testtoc testpregap 
 
 EXTRA_PROGRAMS = testdefault 
 
@@ -50,12 +52,6 @@ testtoc_CFLAGS      = -DTEST_DIR=\"$(srcdir)\"
 test_lib_driver_util_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
 tets_lib_driver_util_CFLAGS   = -DTEST_DIR=\"$(srcdir)\"
 
-testlinux_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
-testlinux_CFLAGS   = -DTEST_DIR=\"$(srcdir)\"
-
-testsolaris_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
-testsolaris_CFLAGS   = -DTEST_DIR=\"$(srcdir)\"
-
 testpregap_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
 testpregap_CFLAGS   = -DTEST_DIR=\"$(srcdir)\"
 
diff --git a/test/driver/.gitignore b/test/driver/.gitignore
new file mode 100644
index 00000000..aeaec0f7
--- /dev/null
+++ b/test/driver/.gitignore
@@ -0,0 +1 @@
+/*~
diff --git a/test/driver/Makefile.am b/test/driver/Makefile.am
new file mode 100644
index 00000000..8da5cfe1
--- /dev/null
+++ b/test/driver/Makefile.am
@@ -0,0 +1,31 @@
+#   Copyright (C) 2009 Rocky Bernstein <rocky@gnu.org>
+#
+#   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 3 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, see <http://www.gnu.org/licenses/>.
+
+INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS)
+
+gnu_linux_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
+gnu_linux_CFLAGS   = -DTEST_DIR=\"$(srcdir)\"
+
+solaris_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
+solaris_CFLAGS   = -DTEST_DIR=\"$(srcdir)\"
+
+check_PROGRAMS = gnu_linux solaris
+
+TESTS = $(check_PROGRAMS)
+
+MOSTLYCLEANFILES = core core.* *.dump cdda-orig.wav cdda-try.wav *.raw
+
+test: check-am
+
diff --git a/test/testlinux.c b/test/driver/gnu_linux.c
similarity index 100%
rename from test/testlinux.c
rename to test/driver/gnu_linux.c
diff --git a/test/testsolaris.c b/test/driver/solaris.c
similarity index 100%
rename from test/testsolaris.c
rename to test/driver/solaris.c