diff --git a/Makefile.in b/Makefile.in
index 1edc3ea82..7d33c3d4e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,13 +394,16 @@ nse_check:
 ncat_check:
 	@cd $(NCATDIR) && $(MAKE) check
 
+ndiff_check:
+	@cd $(NDIFFDIR) && $(PYTHON) ndifftest.py
+
 nsock_check:
 	@cd $(NSOCKDIR)/src && $(MAKE) check
 
 zenmap_check:
 	@cd $(ZENMAPDIR) && $(PYTHON) -m unittest discover build/lib.* '*.py'
 
-check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@ @NSE_CHECK@
+check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@ @NSE_CHECK@ @NDIFF_CHECK@
 
 ${srcdir}/configure: configure.ac 
 	cd ${srcdir} && autoconf
diff --git a/configure b/configure
index 56655cb7c..97aa1c094 100755
--- a/configure
+++ b/configure
@@ -689,6 +689,7 @@ BUILDZENMAP
 ZENMAPDIR
 NDIFF_DIST_CLEAN
 NDIFF_CLEAN
+NDIFF_CHECK
 INSTALLNDIFF
 BUILDNDIFF
 NDIFFDIR
@@ -5688,11 +5689,13 @@ fi
 if test "$with_ndiff" = "no"; then
   BUILDNDIFF=""
   INSTALLNDIFF=""
+  NDIFF_CHECK=""
   NDIFF_CLEAN=""
   NDIFF_DIST_CLEAN=""
 else
   BUILDNDIFF=build-ndiff
   INSTALLNDIFF=install-ndiff
+  NDIFF_CHECK="ndiff_check"
   NDIFF_CLEAN=ndiff_clean
   NDIFF_DIST_CLEAN=ndiff_dist_clean
 fi
@@ -5702,6 +5705,7 @@ fi
 
 
 
+
 ZENMAPDIR=zenmap
 
 # Do they want Zenmap?
diff --git a/configure.ac b/configure.ac
index 54363fff1..01a8775a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,17 +218,20 @@ fi
 if test "$with_ndiff" = "no"; then
   BUILDNDIFF=""
   INSTALLNDIFF=""
+  NDIFF_CHECK=""
   NDIFF_CLEAN=""
   NDIFF_DIST_CLEAN=""
 else
   BUILDNDIFF=build-ndiff
   INSTALLNDIFF=install-ndiff
+  NDIFF_CHECK="ndiff_check"
   NDIFF_CLEAN=ndiff_clean
   NDIFF_DIST_CLEAN=ndiff_dist_clean
 fi
 AC_SUBST(NDIFFDIR)
 AC_SUBST(BUILDNDIFF)
 AC_SUBST(INSTALLNDIFF)
+AC_SUBST(NDIFF_CHECK)
 AC_SUBST(NDIFF_CLEAN)
 AC_SUBST(NDIFF_DIST_CLEAN)