diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index c657f34e..b26d0c84 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -8,6 +8,10 @@ endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/include \
   $(LIBCURL_CPPFLAGS)
+  
+if HEAVY_TESTS
+AM_CPPFLAGS += -D_MHD_HEAVY_TESTS=1
+endif  
 
 EXTRA_DIST = README socat.c
 
diff --git a/src/testzzuf/socat.c b/src/testzzuf/socat.c
index 29b086bb..85423aad 100644
--- a/src/testzzuf/socat.c
+++ b/src/testzzuf/socat.c
@@ -43,7 +43,11 @@
  * long for most user's patience.  So this small
  * value is the default.
  */
+#ifndef _MHD_HEAVY_TESTS
 #define LOOP_COUNT 10
+#else  /* ! _MHD_HEAVY_TESTS */
+#define LOOP_COUNT 200
+#endif /* ! _MHD_HEAVY_TESTS */
 
 #define CURL_TIMEOUT 50L