diff --git a/Makefile b/Makefile
index b3c114c88..c02de0972 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,6 @@ all: makeinclude fltk-config
 		echo "=== making $$dir ===";\
 		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
 	done
-	for dir in $(FLUIDDIR); do\
-	  echo "=== making fluidtest ===";\
-	  (cd test; $(MAKE)  $(MFLAGS) allfluid);\
-	done
 
 install: makeinclude
 	-mkdir -p $(DESTDIR)$(bindir)
diff --git a/configure.ac b/configure.ac
index ac4ab6cfb..47ed6a495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1770,7 +1770,9 @@ AS_CASE([$host_os], [mingw*], [
 ])
 
 AS_IF([test x$enable_fluid != xno], [
-    echo "Build fluid: Yes"
+    echo "    Build fluid: YES"
+    ],[
+    echo "    Build fluid: NO"
     ])
     
 dnl
diff --git a/test/Makefile b/test/Makefile
index fc1c8a003..f1187caf5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -243,8 +243,9 @@ GLALL = \
 	unittests$(EXEEXT)
 
 all:	$(ALL) $(GLDEMOS)
-
-allfluid: $(ALLFLUID)
+	for dir in $(FLUIDDIR); do\
+	  $(MAKE)  $(MFLAGS) $(ALLFLUID);\
+	done
 
 gldemos:	$(GLALL)