diff --git a/Makefile.in b/Makefile.in
index d34884035..f6808150f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -385,6 +385,9 @@ uninstall-ncat:
 uninstall-nping:
 	@cd $(NPINGDIR) && $(MAKE) uninstall
 
+check:
+	@cd $(NSOCKDIR)/src && $(MAKE) check
+
 ${srcdir}/configure: configure.ac 
 	cd ${srcdir} && autoconf
 
diff --git a/nsock/src/Makefile.in b/nsock/src/Makefile.in
index a7abc8f02..5a5586da6 100644
--- a/nsock/src/Makefile.in
+++ b/nsock/src/Makefile.in
@@ -24,6 +24,7 @@ INSTALL = $(SHTOOL) install
 MAKEDEPEND = @MAKEDEPEND@
 RPMTDIR=$(HOME)/rpmdir
 NBASEDIR=@NBASEDIR@
+NSOCKTESTDIR=@NSOCKTESTDIR@
 
 TARGET = libnsock.a
 
@@ -64,6 +65,9 @@ distclean: clean
 depend:
 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
 
+check:
+	cd $(NSOCKTESTDIR) && $(MAKE) && ./run_tests.sh
+
 ${srcdir}/configure: configure.ac 
 	cd ${srcdir} && autoconf
 
diff --git a/nsock/src/configure b/nsock/src/configure
index 9925b7304..903b7e2fc 100755
--- a/nsock/src/configure
+++ b/nsock/src/configure
@@ -621,6 +621,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+NSOCKTESTDIR
 NBASEDIR
 LIBNBASE_LIBS
 OPENSSL_LIBS
@@ -4793,6 +4794,8 @@ else
 fi
 
 
+NSOCKTESTDIR="../tests"
+
 LDFLAGS="$LDFLAGS -L$NBASEDIR"
 CPPFLAGS="$CPPFLAGS -I$NBASEDIR"
 LIBNBASE_LIBS="$LIBS -lnbase"
diff --git a/nsock/src/configure.ac b/nsock/src/configure.ac
index c411b8c3a..39bd737ae 100644
--- a/nsock/src/configure.ac
+++ b/nsock/src/configure.ac
@@ -223,12 +223,15 @@ AC_ARG_WITH(libnbase,
 NBASEDIR="../../nbase"
 )
 
+NSOCKTESTDIR="../tests"
+
 LDFLAGS="$LDFLAGS -L$NBASEDIR"
 CPPFLAGS="$CPPFLAGS -I$NBASEDIR"
 LIBNBASE_LIBS="$LIBS -lnbase"
 
 AC_SUBST(LIBNBASE_LIBS)
 AC_SUBST(NBASEDIR)
+AC_SUBST(NSOCKTESTDIR)
 
 AC_SUBST(CFLAGS)