diff --git a/.github/workflows/curl-for-win.yml b/.github/workflows/curl-for-win.yml
index 23e10decc1..f2048052c7 100644
--- a/.github/workflows/curl-for-win.yml
+++ b/.github/workflows/curl-for-win.yml
@@ -185,7 +185,7 @@ jobs:
         run: |
           git clone --depth 1 https://github.com/curl/curl-for-win
           mv curl-for-win/* .
-          export CW_CONFIG='-main-werror-unitybatch-nocertdata-win-x64-gcc-zlibold-noWINE'
+          export CW_CONFIG='-main-werror-unitybatch-nocertdata-curltests-win-x64-gcc-zlibold-noWINE'
           export CW_REVISION="${GITHUB_SHA}"
           . ./_versions.sh
           sudo podman image trust set --type reject default
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index caab715b6d..405a5bb679 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -2630,14 +2630,6 @@ static CURLcode ossl_set_ssl_version_min_max(struct Curl_cfilter *cf,
   return CURLE_OK;
 }
 
-#ifdef LIBRESSL_VERSION_NUMBER
-typedef long ctx_option_t;
-#elif defined(HAVE_BORINGSSL_LIKE)
-typedef uint32_t ctx_option_t;
-#else
-typedef uint64_t ctx_option_t;
-#endif
-
 CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
                                struct Curl_easy *data,
                                const char *ssl_peer_key,
diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h
index e707910be0..53ab60528f 100644
--- a/lib/vtls/openssl.h
+++ b/lib/vtls/openssl.h
@@ -100,6 +100,14 @@
 #define HAVE_OPENSSL_EARLYDATA
 #endif
 
+#ifdef LIBRESSL_VERSION_NUMBER
+typedef long ctx_option_t;
+#elif defined(HAVE_BORINGSSL_LIKE)
+typedef uint32_t ctx_option_t;
+#else
+typedef uint64_t ctx_option_t;
+#endif
+
 struct alpn_spec;
 struct ssl_peer;
 struct Curl_ssl_session;
diff --git a/tests/libtest/lib1587.c b/tests/libtest/lib1587.c
index 5789804acb..9368b53d0b 100644
--- a/tests/libtest/lib1587.c
+++ b/tests/libtest/lib1587.c
@@ -26,13 +26,6 @@
 #ifdef USE_OPENSSL
 #include <vtls/openssl.h>
 
-#ifdef HAVE_BORINGSSL_LIKE
-/* AWS-LC and BoringSSL */
-typedef uint32_t opt1587;
-#else
-typedef uint64_t opt1587;
-#endif
-
 static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *stream)
 {
   const struct curl_tlssessioninfo *info;
@@ -46,7 +39,7 @@ static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *stream)
 
     if(result == CURLE_OK) {
       /* set and read stuff using the SSL_CTX to verify it */
-      opt1587 opts = SSL_CTX_get_options(info->internals);
+      ctx_option_t opts = SSL_CTX_get_options(info->internals);
       SSL_CTX_set_options(info->internals, opts);
       curl_mprintf("CURLINFO_TLS_SESSION: OK\n");
     }
@@ -55,7 +48,7 @@ static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *stream)
 
     if(result == CURLE_OK) {
       /* set and read stuff using the SSL pointer to verify it */
-      opt1587 opts = SSL_get_options(info->internals);
+      ctx_option_t opts = SSL_get_options(info->internals);
       SSL_set_options(info->internals, opts);
       curl_mprintf("CURLINFO_TLS_SSL_PTR: OK\n");
     }