diff --git a/configure.ac b/configure.ac
index e91bc79f9..df3e4ad15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,7 @@ AC_ARG_ENABLE([afs-support],
 	AS_HELP_STRING([--disable-afs-support],[if you don't want support for AFS]))
 if test "$enable_afs_support" = no; then
 	AC_DEFINE(NO_AFS, 1, [Define if you don't wan't support for AFS.])
+	NO_AFS="1"
 fi
 AC_SUBST(NO_AFS)dnl
 
diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am
index 3d54a97ad..52b7f15d6 100644
--- a/tests/bin/Makefile.am
+++ b/tests/bin/Makefile.am
@@ -9,7 +9,7 @@ do_subst = \
 	-e "s,[@]EGREP[@],$(EGREP),g" \
 	-e "s,[@]top_srcdir[@],$${top_srcdir},g" \
 	-e "s,[@]top_builddir[@],$${top_builddir},g" \
-	-e "s,[@]NO_AFS[@],$${NO_AFS},g"
+	-e "s,[@]NO_AFS[@],$(NO_AFS),g"
 
 setup-env: setup-env.in Makefile
 	$(do_subst) < $(srcdir)/setup-env.in > setup-env.tmp