diff --git a/Makefile.am b/Makefile.am
index 19a9022..8371041 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @BABELD@ \
          @ISISD@ @WATCHQUAGGA@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
-         redhat @SOLARIS@
+         redhat @SOLARIS@ @BUILD_TESTS@
 
 DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d babeld \
 	  isisd watchquagga vtysh ospfclient doc m4 pkgsrc redhat tests \
diff --git a/configure.ac b/configure.ac
index 4cc9400..dcca968 100755
--- a/configure.ac
+++ b/configure.ac
@@ -198,6 +198,8 @@
 [  --disable-ipv6          turn off IPv6 related features and daemons])
 AC_ARG_ENABLE(doc,
 [  --disable-doc           do not build docs])
+AC_ARG_ENABLE(tests,
+[  --disable-tests         do not build tests])
 AC_ARG_ENABLE(zebra,
 [  --disable-zebra         do not build zebra daemon])
 AC_ARG_ENABLE(bgpd,
@@ -1232,6 +1234,13 @@
   DOC="doc"
 fi
 
+dnl can't use TESTS as name, that's special with automake
+if test "${enable_tests}" = "no";then
+  BUILD_TESTS=""
+else
+  BUILD_TESTS="tests"
+fi
+
 dnl --------------------
 dnl Daemon disable check
 dnl --------------------
@@ -1325,6 +1334,7 @@
 fi
 
 AC_SUBST(DOC)
+AC_SUBST(BUILD_TESTS)
 AC_SUBST(ZEBRA)
 AC_SUBST(BGPD)
 AC_SUBST(RIPD)