diff --git a/Makefile.am b/Makefile.am
index 90c5cd71..049220e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
 # additional include paths necessary to compile the C++ library
 SUBDIRS = lib benchmarks tests
 
+.PHONY: tests
+
+tests:
+	make -C tests tests
+
 AM_CXXFLAGS += -I$(top_builddir)/include
 ACLOCAL_AMFLAGS = -I m4
diff --git a/README.md b/README.md
index c7461368..49f08237 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,7 @@ To minimise the build time, only the tests at the root of the `tests` directory
 ``` bash
 make -C tests/<subdir> tests
 ```
+If you want to build all the tests at once just use `make tests`.
 
 ### Build configuration options
 
diff --git a/configure.ac b/configure.ac
index 2b759dde..9178a11d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,6 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(subdir-objects)
-AM_EXTRA_RECURSIVE_TARGETS([tests])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/Grid.h])
 AC_CONFIG_HEADERS([lib/Config.h])
diff --git a/lib/algorithms/CoarsenedMatrix.h b/lib/algorithms/CoarsenedMatrix.h
index 3ae0af75..fd9acc91 100644
--- a/lib/algorithms/CoarsenedMatrix.h
+++ b/lib/algorithms/CoarsenedMatrix.h
@@ -282,7 +282,7 @@ PARALLEL_FOR_LOOP
 	  } else if(SE->_is_local) { 
 	    nbr = in._odata[SE->_offset];
 	  } else {
-	    nbr = Stencil.comm_buf[SE->_offset];
+	    nbr = Stencil.CommBuf()[SE->_offset];
 	  }
 	  res = res + A[point]._odata[ss]*nbr;
 	}
diff --git a/scripts/filelist b/scripts/filelist
index 52252ca9..dddb605b 100755
--- a/scripts/filelist
+++ b/scripts/filelist
@@ -20,15 +20,20 @@ for subdir in $dirs; do
     TESTS=`ls T*.cc`
     TESTLIST=`echo ${TESTS} | sed s/.cc//g `
     PREF=`[ $subdir = '.' ] && echo noinst || echo EXTRA`
-    echo "tests-local: ${TESTLIST}" > Make.inc
+    SUB=`[ $subdir = '.' ] && echo subtests`
+    echo "tests: ${TESTLIST} ${SUB}" > Make.inc
     echo ${PREF}_PROGRAMS = ${TESTLIST} >> Make.inc
     echo >> Make.inc
     for f in $TESTS; do
-	BNAME=`basename $f .cc`
-	echo ${BNAME}_SOURCES=$f  >> Make.inc
-	echo ${BNAME}_LDADD=-lGrid>> Make.inc
-	echo >> Make.inc
+	   BNAME=`basename $f .cc`
+	   echo ${BNAME}_SOURCES=$f  >> Make.inc
+	   echo ${BNAME}_LDADD=-lGrid>> Make.inc
+	   echo >> Make.inc
     done
+    if [ $subdir != '.' ]; then
+       echo CLEANFILES = ${TESTLIST} >> Make.inc
+       echo >> Make.inc
+    fi
 done
 
 # benchmarks Make.inc
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2b8cc2d7..c98bc2d0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,4 +4,9 @@ if BUILD_CHROMA_REGRESSION
   SUBDIRS+= qdpxx
 endif
 
+.PHONY: subtests
+
 include Make.inc
+
+subtests:
+	for d in $(SUBDIRS); do make -C $${d} tests; done