diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 2a6f58cb..b8a56bc1 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -118,7 +118,9 @@ check_PROGRAMS = \
   test_get_chunked_empty_sized \
   test_get_chunked_close_empty_sized \
   test_get_chunked_forced \
+  test_get_chunked_close_forced \
   test_get_chunked_empty_forced \
+  test_get_chunked_close_empty_forced \
   test_put_chunked \
   test_callback \
   $(EMPTY_ITEM)
@@ -294,9 +296,15 @@ test_get_chunked_close_empty_sized_SOURCES = \
 test_get_chunked_forced_SOURCES = \
   test_get_chunked.c
 
+test_get_chunked_close_forced_SOURCES = \
+  test_get_chunked.c
+
 test_get_chunked_empty_forced_SOURCES = \
   test_get_chunked.c
 
+test_get_chunked_close_empty_forced_SOURCES = \
+  test_get_chunked.c
+
 test_post_SOURCES = \
   test_post.c mhd_has_in_name.h
 
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c
index dc07f578..5e6bdd76 100644
--- a/src/testcurl/test_get_chunked.c
+++ b/src/testcurl/test_get_chunked.c
@@ -771,8 +771,6 @@ main (int argc, char *const *argv)
     resp_sized = ! 0;
   if (resp_sized)
     chunked_forced = ! 0;
-  if (conn_close) /* TODO: remove when supported by MHD */
-    chunked_forced = ! 0;
   if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_THREADS))
   {
     errorCount += testInternalGet ();