diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index cddd5cf128c6..2203062c4385 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -8,15 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "11damk9x09616cjdfxx9y73igd96zzylgq0l4j57qzify6nlqbw7";
   };
 
+  patches = [ ./test-suite-fix.patch ];
+
   buildInputs = [ m4 perl ];
 
-  # FIXME: The test suite fails on Darwin (see
-  # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6813) and on
-  # Cygwin (see http://hydra.nixos.org/build/53814; yet to be reported
-  # upstream).
-  doCheck =
-    (builtins.currentSystem != "i686-darwin")
-    && (builtins.currentSystem != "i686-cygwin");
+  doCheck = true;
 
   # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
   # "fixed" path in generated files!
diff --git a/pkgs/development/tools/misc/autoconf/test-suite-fix.patch b/pkgs/development/tools/misc/autoconf/test-suite-fix.patch
new file mode 100644
index 000000000000..3d5d20b85625
--- /dev/null
+++ b/pkgs/development/tools/misc/autoconf/test-suite-fix.patch
@@ -0,0 +1,17 @@
+This patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de> fixes
+the "Hard fail" test case.
+
+See http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6814
+for details.
+
+--- a/tests/autotest.at
++++ b/tests/autotest.at
+@@ -271,7 +271,7 @@ AT_CHECK_AT_TEST([Hard fail],
+    AT_CHECK([exit 99])],
+   [], [1], [], [ignore], [],
+   [AT_CHECK([grep '2 failed unexpectedly' micro-suite.log], [], [ignore])
+-   AT_CHECK([grep ok micro-suite.log], [1])])
++   AT_CHECK([grep '^[[12]].*ok' micro-suite.log], [1])])
+ 
+ AT_CHECK_AT_TEST([AT@&t@_FAIL_IF],
+   [AT_FAIL_IF([:])