diff --git a/tests/Makefile.am b/tests/Makefile.am
index 719725bec9..e930be5e38 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,4 +4,13 @@ else
 CHECK_SUBDIRS=
 endif
 
-SUBDIRS= $(CHECK_SUBDIRS) examples
\ No newline at end of file
+if BUILD_EXAMPLES
+EXAMPLES_SUBDIRS= examples
+else
+EXAMPLES_SUBDIRS=
+endif
+
+SUBDIRS= $(CHECK_SUBDIRS) $(EXAMPLES_SUBDIRS)
+
+DIST_SUBDIRS = check examples
+