diff --git a/test/build.info b/test/build.info
index d731f9cceb..0c51d1e5c8 100644
--- a/test/build.info
+++ b/test/build.info
@@ -262,7 +262,13 @@ IF[{- !$disabled{tests} -}]
   SOURCE[bioprinttest]=bioprinttest.c
   INCLUDE[bioprinttest]=../include
   DEPEND[bioprinttest]=../libcrypto
-  {-
+
+  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c
+  INCLUDE[sslapitest]=../include
+  DEPEND[sslapitest]=../libcrypto ../libssl
+ENDIF
+
+{-
    use File::Spec::Functions;
    use File::Basename;
    use if $^O ne "VMS", 'File::Glob' => qw/glob/;
@@ -286,9 +292,4 @@ IF[{- !$disabled{tests} -}]
   DEPEND[buildtest_$name]=../libssl ../libcrypto
 _____
    }
-  -}
-
-  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c
-  INCLUDE[sslapitest]=../include
-  DEPEND[sslapitest]=../libcrypto ../libssl
-ENDIF
+-}
diff --git a/test/generate_buildtest.pl b/test/generate_buildtest.pl
index 7921021e45..0a9d879eb1 100644
--- a/test/generate_buildtest.pl
+++ b/test/generate_buildtest.pl
@@ -11,6 +11,7 @@ use warnings;
 
 # First argument is name;
 my $name = shift @ARGV;
+my $name_uc = uc $name;
 # All other arguments are ignored for now
 
 print <<"_____";
@@ -18,7 +19,13 @@ print <<"_____";
  * Generated with test/generate_buildtest.pl, to check that such a simple
  * program builds.
  */
-#include <openssl/$name.h>
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_STDIO
+# include <stdio.h>
+#endif
+#ifndef OPENSSL_NO_${name_uc}
+# include <openssl/$name.h>
+#endif
 
 int main()
 {