diff --git a/Makefile.am b/Makefile.am
index 80e3ed3..ad1ffcd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ INST_DIR = inst
 endif
 
 # Subdirectories
-SUBDIRS = include $(INST_DIR) src pyext test examples
+SUBDIRS = include $(INST_DIR) src pyext examples test
 
 # Pkgconfig directory
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index 2b9c34f..228324e 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -16,6 +16,9 @@ bin_PROGRAMS = createfits \
                optimize \
                readmodel
 
+# Test programs (needed so that files are compiled for 'make check')
+check_PROGRAMS = $(bin_PROGRAMS)
+
 # Program definition
 createfits_SOURCES = createfits.cpp
 createfits_LDFLAGS = @LDFLAGS@