diff --git a/engines/build.info b/engines/build.info
index e42684f93a54dacd22976705aba5ef402c815fad..25917ff034ac98de54051364d61068222e0ad8dc 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -8,7 +8,8 @@ IF[{- !$disabled{"engine"} -}]
       SOURCE[../libcrypto]=e_capi.c
     ENDIF
   ELSE
-    ENGINES=padlock dasync ossltest
+    ENGINES=padlock dasync
+    ENGINES_NO_INST=ossltest
     SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
     DEPEND[padlock]=../libcrypto
     INCLUDE[padlock]=../include
diff --git a/fuzz/build.info b/fuzz/build.info
index a3d38499ffb6e4dc957aeee3a38936f9377c9ab6..9d90bc74ceabff00e6c3d3285f59524388c96970 100644
--- a/fuzz/build.info
+++ b/fuzz/build.info
@@ -9,7 +9,7 @@
 -}
 
 IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]
-  PROGRAMS=asn1 asn1parse bignum bndiv cms conf crl ct server x509
+  PROGRAMS_NO_INST=asn1 asn1parse bignum bndiv cms conf crl ct server x509
 
   SOURCE[asn1]=asn1.c driver.c
   INCLUDE[asn1]=../include {- $ex_inc -}
@@ -53,7 +53,7 @@ IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]
 ENDIF
 
 IF[{- !$disabled{tests} -}]
-  PROGRAMS=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test crl-test ct-test server-test x509-test
+  PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test crl-test ct-test server-test x509-test
 
   SOURCE[asn1-test]=asn1.c test-corpus.c
   INCLUDE[asn1-test]=../include
diff --git a/test/build.info b/test/build.info
index 30f94a2385c73eed487f9d469df02319ee4c8cdf..4e1ec65bc55f25b75429a332916ea81a3c586dd5 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,5 +1,5 @@
 IF[{- !$disabled{tests} -}]
-  PROGRAMS=\
+  PROGRAMS_NO_INST=\
           aborttest \
           sanitytest bntest \
           ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
@@ -275,7 +275,7 @@ IF[{- !$disabled{tests} -}]
        next if grep { $_ eq lc("$name.h") } @nogo_headers;
        $OUT .= <<"_____";
 
-  PROGRAMS=buildtest_$name
+  PROGRAMS_NO_INST=buildtest_$name
   GENERATE[buildtest_$name.c]=generate_buildtest.pl $name
   SOURCE[buildtest_$name]=buildtest_$name.c
   INCLUDE[buildtest_$name]=../include