diff --git a/test/asm/Makefile.am b/test/asm/Makefile.am
index 5a12aa2a88..31cbe61d74 100644
--- a/test/asm/Makefile.am
+++ b/test/asm/Makefile.am
@@ -87,3 +87,6 @@ maintainer-clean-local:
 	atomic_spinlock_noinline.c \
 	atomic_math_noinline.c \
 	atomic_cmpset_noinline.c
+
+distclean:
+	rm -rf *.dSYM .deps .libs *.log *.o *.trs $(check_PROGRAMS) Makefile
diff --git a/test/class/Makefile.am b/test/class/Makefile.am
index a3b4081ffb..46481bca9e 100644
--- a/test/class/Makefile.am
+++ b/test/class/Makefile.am
@@ -102,3 +102,6 @@ opal_fifo_DEPENDENCIES = $(opal_fifo_LDADD)
 
 clean-local:
 	rm -f opal_bitmap_test_out.txt opal_hash_table_test_out.txt opal_proc_table_test_out.txt
+
+distclean:
+	rm -rf *.dSYM .deps .libs *.log *.txt *.o *.trs $(check_PROGRAMS) Makefile
diff --git a/test/datatype/Makefile.am b/test/datatype/Makefile.am
index 37b89c96be..d870e6902e 100644
--- a/test/datatype/Makefile.am
+++ b/test/datatype/Makefile.am
@@ -71,3 +71,6 @@ opal_datatype_test_SOURCES = opal_datatype_test.c opal_ddt_lib.c opal_ddt_lib.h
 opal_datatype_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 opal_datatype_test_LDADD = \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+
+distclean:
+	rm -rf *.dSYM .deps .libs *.log *.o *.trs $(check_PROGRAMS) Makefile
diff --git a/test/event/Makefile.am b/test/event/Makefile.am
index fc4fbe58dd..92f238d05a 100644
--- a/test/event/Makefile.am
+++ b/test/event/Makefile.am
@@ -43,3 +43,6 @@ event_test_LDFLAGS = $(OPAL_PKG_CONFIG_LDFLAGS)
 event_test_LDADD = \
         $(top_builddir)/opal/libopen-pal.la
 event_test_DEPENDENCIES = $(event_test_LDADD)
+
+distclean:
+	rm -rf *.dSYM .deps .libs *.log *.o *.trs $(check_PROGRAMS) Makefile
diff --git a/test/memchecker/Makefile.am b/test/memchecker/Makefile.am
index 00fc2193ae..798cf97a3e 100644
--- a/test/memchecker/Makefile.am
+++ b/test/memchecker/Makefile.am
@@ -59,3 +59,6 @@ non_blocking_recv_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 non_blocking_recv_test_LDADD = \
         $(top_builddir)/ompi/libmpi.la
 non_blocking_recv_test_DEPENDENCIES = $(non_blocking_recv_test_LDADD)
+
+distclean:
+	rm -rf *.dSYM .deps *.log *.o *.trs $(check_PROGRAMS) Makefile
diff --git a/test/monitoring/Makefile.am b/test/monitoring/Makefile.am
index 028e6810a8..af2c022305 100644
--- a/test/monitoring/Makefile.am
+++ b/test/monitoring/Makefile.am
@@ -28,3 +28,6 @@ if MCA_BUILD_ompi_pml_monitoring_DSO
 endif
 
 endif
+
+distclean:
+	rm -rf *.dSYM .deps .libs *.la *.lo monitoring_test *.log *.o *.trs Makefile
diff --git a/test/mpi/environment/Makefile.am b/test/mpi/environment/Makefile.am
index 2ce96ae40c..761c881d3b 100644
--- a/test/mpi/environment/Makefile.am
+++ b/test/mpi/environment/Makefile.am
@@ -27,3 +27,6 @@ chello_LDADD = \
 	$(top_builddir)/src/libompi.la
 chello_DEPENDENCIES = $(chello_LDADD)
 
+
+distclean:
+	rm -rf *.dSYM .deps *.log *.o *.trs $(noinst_PROGRAMS) Makefile
diff --git a/test/runtime/Makefile.am b/test/runtime/Makefile.am
index ab03ee151d..9d0add7e94 100644
--- a/test/runtime/Makefile.am
+++ b/test/runtime/Makefile.am
@@ -54,3 +54,6 @@ opal_init_finalize_LDADD = \
 	$(top_builddir)/opal/libopen-pal.la \
 	$(top_builddir)/test/support/libsupport.a
 opal_init_finalize_DEPENDENCIES = $(opal_init_finalize_LDADD)
+
+distclean:
+	rm -rf *.dSYM .deps *.log *.o *.trs $(check_PROGRAMS) Makefile
diff --git a/test/support/Makefile.am b/test/support/Makefile.am
index 12a4cf2b52..30a15ba6e5 100644
--- a/test/support/Makefile.am
+++ b/test/support/Makefile.am
@@ -31,3 +31,6 @@ check_LIBRARIES = libsupport.a
 libsupport_a_SOURCES = \
         support.c \
         support.h
+
+distclean:
+	rm -rf *.dSYM .deps *.log *.o *.trs $(check_LIBRARIES) Makefile
diff --git a/test/threads/Makefile.am b/test/threads/Makefile.am
index 3b75ec7e9f..a573d99965 100644
--- a/test/threads/Makefile.am
+++ b/test/threads/Makefile.am
@@ -41,3 +41,5 @@ opal_condition_LDADD = \
         $(top_builddir)/opal/libopen-pal.la
 opal_condition_DEPENDENCIES = $(opal_condition_LDADD)
 
+distclean:
+	rm -rf *.dSYM .deps .libs *.log *.o *.trs $(check_PROGRAMS) Makefile
diff --git a/test/util/Makefile.am b/test/util/Makefile.am
index 324b80f277..8d8127a68b 100644
--- a/test/util/Makefile.am
+++ b/test/util/Makefile.am
@@ -119,3 +119,7 @@ opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD)
 
 clean-local:
 	rm -f test_session_dir_out test-file opal_path_nfs.out
+
+distclean:
+	rm -rf *.dSYM .deps .libs *.out *.log *.o *.trs $(check_PROGRAMS) Makefile
+