diff --git a/Makefile.in b/Makefile.in
index 9df122e..957ed42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,7 +118,7 @@ thin_repair: $(THIN_REPAIR_OBJECTS) thin_repair.o
 clean:
 	$(RM) *.o unit-tests/*.o *.d unit-tests/*.d $(TEST_PROGRAMS) $(PROGRAMS)
 distclean: clean
-	$(RM) config.cache config.log config.status configure.h version.h Makefile unit-tests/Makefile.in
+	$(RM) config.cache config.log config.status configure.h version.h Makefile unit-tests/Makefile
 
 .PHONEY: install
 install: $(PROGRAMS)
@@ -138,5 +138,5 @@ ifeq (,$(findstring $(MAKECMDGOALS),clean distclean))
 endif
 
 ifeq ("@TESTING@", "yes")
-include unit-tests/Makefile.in
+include unit-tests/Makefile
 endif
diff --git a/configure.in b/configure.in
index 4c8e7c6..0681dda 100644
--- a/configure.in
+++ b/configure.in
@@ -148,7 +148,7 @@ dnl -- First and last lines should not contain files to generate in order to
 dnl -- keep utility scripts running properly
 AC_CONFIG_FILES([
 Makefile
-unit-tests/Makefile.in
+unit-tests/Makefile
 version.h
 ])
 AC_OUTPUT
diff --git a/unit-tests/Makefile.in.in b/unit-tests/Makefile.in.in
deleted file mode 100644
index 783c4f7..0000000
--- a/unit-tests/Makefile.in.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
-#
-# This file is part of the thin-provisioning-tools source.
-#
-# thin-provisioning-tools 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.
-#
-# thin-provisioning-tools 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 thin-provisioning-tools.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-TEST_SOURCE=\
-	unit-tests/cache_t.cc
-
-# FIXME Make these tests work.
-#	unit-tests/block_t.cc \
-	unit-tests/btree_t.cc \
-	unit-tests/endian_t.cc \
-	unit-tests/run_list_t.cc \
-	unit-tests/space_map_t.cc \
-	unit-tests/space_map_disk_t.cc \
-	unit-tests/transaction_manager_t.cc
-
-TEST_PROGRAMS=$(subst .cc,,$(TEST_SOURCE))
-
-.PHONEY: unit-test
-
-unit-test: $(TEST_PROGRAMS)
-	for p in $(TEST_PROGRAMS); do echo Running $$p; ./$$p; done
-
-unit-tests/block_t: unit-tests/block_t.o
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS)
-
-unit-tests/btree_t: unit-tests/btree_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
-
-unit-tests/cache_t: unit-tests/cache_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
-
-unit-tests/run_list_t: unit-tests/run_list_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
-
-unit-tests/space_map_t: unit-tests/space_map_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
-
-unit-tests/space_map_disk_t: unit-tests/space_map_disk_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
-
-unit-tests/transaction_manager_t: unit-tests/transaction_manager_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
-
-unit-tests/metadata_t: unit-tests/metadata_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
-
-unit-tests/endian_t: unit-tests/endian_t.o $(OBJECTS)
-	g++ $(CXXFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)