diff --git a/scripts/build_config.sh b/scripts/build_config.sh
index 054ee86756489dab7a77e00262efde89d72883d1..ab705778cf975a4e2c84234c1af2d7db84362313 100755
--- a/scripts/build_config.sh
+++ b/scripts/build_config.sh
@@ -113,6 +113,7 @@ ZMAP_SSH_OPTIONS="-oStrictHostKeyChecking=no \
 -oNumberOfPasswordPrompts=0"
 
 ZMAP_MAKE=yes
+ZMAP_MAKE_CHECK=yes
 ZMAP_MAKE_INSTALL=yes
 ZMAP_RELEASES_DIR=~zmap/BUILDS
 ZMAP_RELEASE_LEVEL=DEVELOPMENT
diff --git a/scripts/zmap_build_and_tar.sh b/scripts/zmap_build_and_tar.sh
index 6bc056a2c3cd613616866f96db3c136aac2353b0..771bd3832f05b6fec58045a15585707f2ccfbfd8 100755
--- a/scripts/zmap_build_and_tar.sh
+++ b/scripts/zmap_build_and_tar.sh
@@ -73,6 +73,41 @@ if [ "x$ZMAP_MAKE" == "x$ZMAP_TRUE" ]; then
     make         || zmap_message_exit $(hostname) "Failed Running make"
 fi
 
+
+if [ "x$ZMAP_MAKE_CHECK" == "x$ZMAP_TRUE" ]; then
+    zmap_message_out "Running make check"
+    CHECK_LOG_FILE=$(pwd)/$0.check.log
+
+    MAKE_CHECK_FAILED=no
+
+    make check check_zmap_LOG_FILE=$CHECK_LOG_FILE || MAKE_CHECK_FAILED=$ZMAP_TRUE
+
+    if [ "x$MAKE_CHECK_FAILED" == "x$ZMAP_TRUE" ]; then
+	
+	TMP_LOG=/tmp/zmap_fail.$$.log
+
+	echo "ZMap Tests Failure"                            > $TMP_LOG
+	echo ""                                             >> $TMP_LOG
+	echo "Tail of make check log:"                      >> $TMP_LOG
+	echo ""                                             >> $TMP_LOG
+	tail $CHECK_LOG_FILE                                >> $TMP_LOG
+	echo ""                                             >> $TMP_LOG
+	echo "Full log is here $(hostname):$CHECK_LOG_FILE" >> $TMP_LOG
+
+	ERROR_RECIPIENT=$ZMAP_MASTER_NOTIFY_MAIL
+
+	if [ "x$ERROR_RECIPIENT" != "x" ]; then
+	    zmap_message_out "Mailing log to $ERROR_RECIPIENT"
+
+	    cat $TMP_LOG | mailx -s "ZMap Tests Failure" $ERROR_RECIPIENT
+	fi
+	rm -f $TMP_LOG
+
+	zmap_message_exit $(hostname) "Failed Running make check"
+    fi
+fi
+
+
 if [ "x$ZMAP_MAKE_INSTALL" == "x$ZMAP_TRUE" ]; then
     zmap_message_out "Running make install"
     make install || zmap_message_exit $(hostname) "Failed running make install"
diff --git a/src/share/ZMap/ZMap b/src/share/ZMap/ZMap
new file mode 100755
index 0000000000000000000000000000000000000000..fdbaa89eda9af46e0fa1a7a97f98d1f6e2dd4076
--- /dev/null
+++ b/src/share/ZMap/ZMap
@@ -0,0 +1,17 @@
+# Used as a sample and by the test suite.
+
+[ZMap]
+default-sequence = b0250
+default-printer = print-1
+sources = manual_annotation;automatic_annotation
+
+[logging]
+logging = true
+show-code = false
+
+[manual_annotation]
+url = "acedb://any:any@server:1000"
+
+[automatic_annotation]
+url = "acedb://any:any@server:1001"
+