diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl
index d0fcb7d60f..053040a9c5 100755
--- a/scripts/generate_visualc_files.pl
+++ b/scripts/generate_visualc_files.pl
@@ -22,6 +22,7 @@ my $vsx_sln_tpl_file = "scripts/data_files/vs2017-sln-template.sln";
 my $vsx_sln_file = "$vsx_dir/mbedTLS.sln";
 
 my $mbedtls_programs_dir = "programs";
+my $framework_programs_dir = "framework/tests/programs";
 my $tfpsacrypto_programs_dir = "tf-psa-crypto/programs";
 
 my $mbedtls_header_dir = 'include/mbedtls';
@@ -59,6 +60,7 @@ my @include_directories = qw(
     tf-psa-crypto/drivers/everest/include/everest/kremlib
     tests/include
     framework/tests/include
+    framework/tests/programs
 );
 my $include_directories = join(';', map {"../../$_"} @include_directories);
 
@@ -125,6 +127,7 @@ sub check_dirs {
         && -d $tls_test_header_dir
         && -d $test_drivers_header_dir
         && -d $mbedtls_programs_dir
+        && -d $framework_programs_dir
         && -d $tfpsacrypto_programs_dir;
 }
 
@@ -164,7 +167,14 @@ sub gen_app {
     (my $appname = $path) =~ s/.*\\//;
     my $is_test_app = ($path =~ m/^test\\/);
 
-    my $srcs = "<ClCompile Include=\"..\\..\\programs\\$path.c\" \/>";
+    my $srcs;
+    if( $appname eq "metatest" or $appname eq "query_compile_time_config" or
+        $appname eq "query_included_headers" or $appname eq "zeroize" ) {
+        $srcs = "<ClCompile Include=\"..\\..\\framework\\tests\\programs\\$appname.c\" \/>";
+    } else {
+        $srcs = "<ClCompile Include=\"..\\..\\programs\\$path.c\" \/>";
+    }
+
     if( $appname eq "ssl_client2" or $appname eq "ssl_server2" or
         $appname eq "query_compile_time_config" ) {
         $srcs .= "\n    <ClCompile Include=\"..\\..\\programs\\test\\query_config.c\" \/>";
@@ -283,6 +293,7 @@ sub main {
                        $tls_source_dir,
                        $crypto_core_source_dir,
                        $crypto_source_dir,
+                       $framework_programs_dir,
                        @thirdparty_header_dirs,
                       );
     my @headers = (map { <$_/*.h> } @header_dirs);