diff --git a/.gitignore b/.gitignore
index 15106344..861604fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,11 @@
 
 # *all* Makefiles
 Makefile
+*.tmp
 
 # Java
 /java/*.class
+/java/Makefile*
 
 # Links under apps
 /apps/CA.pl
@@ -203,6 +205,6 @@ apps/gmssl
 
 include/openssl/srp.h
 
-/build.sh
+/*.sh
 
 
diff --git a/Configure b/Configure
index 73890dde..0b6ffa73 100755
--- a/Configure
+++ b/Configure
@@ -436,13 +436,14 @@ my @disablables = (
     "rsa",
     "pem",
     "pkcs7",
-    "pkcs12",
     "serpent",
     "speck",
     "base58",
     "java",
     "ca",
     "gmtls",
+    "fuzz",
+    "test",
     );
 foreach my $proto ((@tls, @dtls))
 	{
@@ -932,6 +933,20 @@ foreach (sort (keys %disabled))
 		push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
 		print " OPENSSL_NO_ENGINE (skip engines)";
 		}
+	elsif (/^test$/)
+		{
+		@{$config{dirs}} = grep !/^test$/, @{$config{dirs}};
+		#@{$config{sdirs}} = grep !/^engine$/, @{$config{sdirs}};
+		#push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
+		print " OPENSSL_NO_TEST (skip test)";
+		}
+	elsif (/^fuzz$/)
+		{
+		@{$config{dirs}} = grep !/^fuzz$/, @{$config{dirs}};
+		#@{$config{sdirs}} = grep !/^engine$/, @{$config{sdirs}};
+		#push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
+		print " OPENSSL_NO_FUZZ (skip fuzz)";
+		}
 	else
 		{
 		my ($WHAT, $what);
diff --git a/fuzz/build.info b/fuzz/build.info
index eade2189..af6b2dd9 100644
--- a/fuzz/build.info
+++ b/fuzz/build.info
@@ -61,7 +61,11 @@ IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]
 ENDIF
 
 IF[{- !$disabled{tests} -}]
-  PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-test conf-test crl-test server-test x509-test
+  PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-test conf-test crl-test x509-test
+
+  IF[{- !$disabled{"rsa"} -}]
+    PROGRAMS_NO_INST=server-test
+  ENDIF
 
   IF[{- !$disabled{"cms"} -}]
     PROGRAMS_NO_INST=cms-test