2 files changed, 4 insertions, 0 deletions
diff --git a/Configure b/Configure
index 133136077d..b95f31101a 100755
--- a/Configure
+++ b/Configure
@@ -342,6 +342,7 @@ my @disablables = (
     "filenames",
     "fuzz-libfuzzer",
     "fuzz-afl",
+    "fuzz-test",
     "gost",
     "heartbeats",
     "hw(-.+)?",
diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/05-test_fuzz.t
index d152925733..f1ccfe32f8 100755
--- a/test/recipes/05-test_fuzz.t
+++ b/test/recipes/05-test_fuzz.t
@@ -15,6 +15,9 @@ use OpenSSL::Test::Utils;
 
 setup("test_fuzz");
 
+plan skip_all => "Fuzz testing is disabled by this OpenSSL build"
+    if disabled("fuzz-test");
+
 my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'conf', 'crl', 'server', 'x509');
 if (!disabled("cms")) {
     push @fuzzers, 'cms';