diff --git a/bochs-testing/plugin-test/test1-static/Makefile.in b/bochs-testing/plugin-test/test1-static/Makefile.in
index bc6691301..995215398 100644
--- a/bochs-testing/plugin-test/test1-static/Makefile.in
+++ b/bochs-testing/plugin-test/test1-static/Makefile.in
@@ -1,4 +1,5 @@
 top_builddir = ..
+top_srcdir = @srcdir@/..
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -18,11 +19,6 @@ libmodule1.la: module1.lo
 %.lo: %.cc
 	$(LIBTOOL) $(CXX) $(CXXFLAGS) -c $<
 
-test:
-	@echo "*** Running test in `pwd`"
-	-./uselib
-	@echo "*** Test done in `pwd`"
+include	${top_srcdir}/common-make-defs.txt
 
-clean: 
-	-$(LIBTOOL) rm libmodule1.la module1.lo uselib.exe uselib
-	rm -rf .libs
+clean: clean-common
diff --git a/bochs-testing/plugin-test/test2-dynamic/Makefile.in b/bochs-testing/plugin-test/test2-dynamic/Makefile.in
index dc038342c..52fdbaab0 100644
--- a/bochs-testing/plugin-test/test2-dynamic/Makefile.in
+++ b/bochs-testing/plugin-test/test2-dynamic/Makefile.in
@@ -1,4 +1,5 @@
 top_builddir = ..
+top_srcdir = @srcdir@/..
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -21,12 +22,6 @@ libmodule1.la: module1.lo
 %.lo: %.cc %.h
 	$(LIBTOOL) $(CXX) $(CXXFLAGS) -c $<
 
-test:
-	@echo "*** Running test in `pwd`"
-	-./uselib
-	@echo "*** Test done in `pwd`"
+include	${top_srcdir}/common-make-defs.txt
 
-clean:
-	-$(LIBTOOL) rm libmodule1.la module1.lo
-	rm -rf *.o uselib.exe bin lib uselib uselib.exe
-	rm -rf .libs
+clean: clean-common
diff --git a/bochs-testing/plugin-test/test3-twomodules/Makefile.in b/bochs-testing/plugin-test/test3-twomodules/Makefile.in
index 8c7a13a24..cf4cdd2ca 100644
--- a/bochs-testing/plugin-test/test3-twomodules/Makefile.in
+++ b/bochs-testing/plugin-test/test3-twomodules/Makefile.in
@@ -1,4 +1,5 @@
 top_builddir = ..
+top_srcdir = @srcdir@/..
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -26,12 +27,6 @@ libmodule2.la: module2.lo
 %.lo: %.cc
 	$(LIBTOOL) $(CXX) $(CXXFLAGS) -c $<
 
-test:
-	@echo "*** Running test in `pwd`"
-	-./uselib
-	@echo "*** Test done in `pwd`"
+include	${top_srcdir}/common-make-defs.txt
 
-clean:
-	-$(LIBTOOL) rm libmodule1.la module1.lo libmodule2.la module2.lo
-	rm -rf *.o uselib.exe bin lib uselib uselib.exe
-	rm -rf .libs
+clean: clean-common
diff --git a/bochs-testing/plugin-test/test4-interdep/Makefile.in b/bochs-testing/plugin-test/test4-interdep/Makefile.in
index 6ae8c84fe..0eb62a578 100644
--- a/bochs-testing/plugin-test/test4-interdep/Makefile.in
+++ b/bochs-testing/plugin-test/test4-interdep/Makefile.in
@@ -1,4 +1,5 @@
 top_builddir = ..
+top_srcdir = @srcdir@/..
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -26,12 +27,6 @@ libmodule2.la: module2.lo
 %.lo: %.cc
 	$(LIBTOOL) $(CXX) $(CXXFLAGS) -c $<
 
-test:
-	@echo "*** Running test in `pwd`"
-	-./uselib
-	@echo "*** Test done in `pwd`"
+include	${top_srcdir}/common-make-defs.txt
 
-clean:
-	-$(LIBTOOL) rm libmodule1.la module1.lo libmodule2.la module2.lo
-	rm -rf *.o uselib.exe bin lib uselib uselib.exe
-	rm -rf .libs
+clean: clean-common
diff --git a/bochs-testing/plugin-test/test5-execsymbols/Makefile.in b/bochs-testing/plugin-test/test5-execsymbols/Makefile.in
index 6ae8c84fe..0eb62a578 100644
--- a/bochs-testing/plugin-test/test5-execsymbols/Makefile.in
+++ b/bochs-testing/plugin-test/test5-execsymbols/Makefile.in
@@ -1,4 +1,5 @@
 top_builddir = ..
+top_srcdir = @srcdir@/..
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -26,12 +27,6 @@ libmodule2.la: module2.lo
 %.lo: %.cc
 	$(LIBTOOL) $(CXX) $(CXXFLAGS) -c $<
 
-test:
-	@echo "*** Running test in `pwd`"
-	-./uselib
-	@echo "*** Test done in `pwd`"
+include	${top_srcdir}/common-make-defs.txt
 
-clean:
-	-$(LIBTOOL) rm libmodule1.la module1.lo libmodule2.la module2.lo
-	rm -rf *.o uselib.exe bin lib uselib uselib.exe
-	rm -rf .libs
+clean: clean-common
diff --git a/bochs-testing/plugin-test/test6-ltdlopen/Makefile.in b/bochs-testing/plugin-test/test6-ltdlopen/Makefile.in
index 0e0dedad9..0788edb4a 100644
--- a/bochs-testing/plugin-test/test6-ltdlopen/Makefile.in
+++ b/bochs-testing/plugin-test/test6-ltdlopen/Makefile.in
@@ -48,12 +48,6 @@ uselib.exe: main.cc main.h
 	$(CXX) $(CXXFLAGS) -c $<
 #######################################################################
 
-test:
-	@echo "*** Running test in `pwd`"
-	-./uselib
-	@echo "*** Test done in `pwd`"
+include	${top_srcdir}/common-make-defs.txt
 
-clean:
-	-$(LIBTOOL) rm libmodule1.la module1.lo libmodule2.la module2.lo
-	rm -rf *.o *.lo *.la uselib.exe bin lib uselib uselib.exe
-	rm -rf .libs
+clean: clean-common
diff --git a/bochs-testing/plugin-test/test7-win32dll/Makefile.in b/bochs-testing/plugin-test/test7-win32dll/Makefile.in
index c3742f55f..b8474078e 100644
--- a/bochs-testing/plugin-test/test7-win32dll/Makefile.in
+++ b/bochs-testing/plugin-test/test7-win32dll/Makefile.in
@@ -25,12 +25,6 @@ module2.dll: module2.cc main.h
 %.o: %.cc
 	$(CXX) $(CXXFLAGS) -c $<
 
-test:
-	@echo "*** Running test in `pwd`"
-	-./uselib
-	@echo "*** Test done in `pwd`"
+include	${top_srcdir}/common-make-defs.txt
 
-clean:
-	-$(LIBTOOL) rm libmodule1.la module1.lo libmodule2.la module2.lo
-	-rm -rf *.o *.lo *.la *.dll uselib.exe bin lib uselib uselib.exe
-	-rm -rf .libs
+clean: clean-common