diff --git a/Makefile.in b/Makefile.in
index 8eab72a3c..b4dd03456 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,7 +394,10 @@ ncat_check:
 nsock_check:
 	@cd $(NSOCKDIR)/src && $(MAKE) check
 
-check: @NCAT_CHECK@ @NSOCK_CHECK@
+zenmap_check:
+	@cd $(ZENMAPDIR) && $(PYTHON) -m unittest discover build/lib.* '*.py'
+
+check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@
 
 ${srcdir}/configure: configure.ac 
 	cd ${srcdir} && autoconf
diff --git a/configure b/configure
index 565a40000..799a3cc55 100755
--- a/configure
+++ b/configure
@@ -681,6 +681,7 @@ NPINGDIR
 subdirs
 ZENMAP_DIST_CLEAN
 ZENMAP_CLEAN
+ZENMAP_CHECK
 UNINSTALLZENMAP
 INSTALLZENMAP
 BUILDZENMAP
@@ -5953,12 +5954,14 @@ if test "$with_zenmap" = "no"; then
   BUILDZENMAP=""
   INSTALLZENMAP=""
   UNINSTALLZENMAP=""
+  ZENMAP_CHECK=""
   ZENMAP_CLEAN=""
   ZENMAP_DIST_CLEAN=""
 else
   BUILDZENMAP=build-zenmap
   INSTALLZENMAP=install-zenmap
   UNINSTALLZENMAP=uninstall-zenmap
+  ZENMAP_CHECK=zenmap_check
   ZENMAP_CLEAN=zenmap_clean
   ZENMAP_DIST_CLEAN=zenmap_dist_clean
 fi
@@ -5969,6 +5972,7 @@ fi
 
 
 
+
 NPINGDIR=nping
 
 # Do they want Nping?
diff --git a/configure.ac b/configure.ac
index 79943ad0d..d3bfb6ae0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,12 +250,14 @@ if test "$with_zenmap" = "no"; then
   BUILDZENMAP=""
   INSTALLZENMAP=""
   UNINSTALLZENMAP=""
+  ZENMAP_CHECK=""
   ZENMAP_CLEAN=""
   ZENMAP_DIST_CLEAN=""
 else
   BUILDZENMAP=build-zenmap
   INSTALLZENMAP=install-zenmap
   UNINSTALLZENMAP=uninstall-zenmap
+  ZENMAP_CHECK=zenmap_check
   ZENMAP_CLEAN=zenmap_clean
   ZENMAP_DIST_CLEAN=zenmap_dist_clean
 fi
@@ -263,6 +265,7 @@ AC_SUBST(ZENMAPDIR)
 AC_SUBST(BUILDZENMAP)
 AC_SUBST(INSTALLZENMAP)
 AC_SUBST(UNINSTALLZENMAP)
+AC_SUBST(ZENMAP_CHECK)
 AC_SUBST(ZENMAP_CLEAN)
 AC_SUBST(ZENMAP_DIST_CLEAN)