diff --git a/configure.ac b/configure.ac
index 148fbc3db..e707f8657 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,8 @@ then
     AM_CFLAGS="$AM_CFLAGS -DTEST_IPV6"
 fi
 
+AM_CONDITIONAL([BUILD_IPV6], [test "x$ENABLED_IPV6" = "xyes"])
+
 
 # Fortress build 
 AC_ARG_ENABLE([fortress],
diff --git a/scripts/include.am b/scripts/include.am
index 091f3d7a4..0591e2813 100644
--- a/scripts/include.am
+++ b/scripts/include.am
@@ -10,7 +10,9 @@ endif
 
 if BUILD_EXAMPLES
 dist_noinst_SCRIPTS+= scripts/resume.test
+if !BUILD_IPV6
 dist_noinst_SCRIPTS+= scripts/external.test
 endif
+endif
 
 EXTRA_DIST +=  scripts/testsuite.pcap