diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index e743ed4a..730866dc 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -45,6 +45,9 @@ project
       <library>/boost/smart_ptr//boost_smart_ptr
       <threading>multi
       <define>BOOST_SYSTEM_NO_DEPRECATED
+
+      # Test and support only C++17 builds with BOOST_DLL_USE_STD_FS=1
+      <target-os>windows,<toolset>gcc:<define>BOOST_DLL_USE_STD_FS=1
     ;
 {
 
diff --git a/test/appveyor.yml b/test/appveyor.yml
index 3373eb97..045ce889 100644
--- a/test/appveyor.yml
+++ b/test/appveyor.yml
@@ -53,25 +53,10 @@ environment:
       TOOLSET: clang-win
       CXXSTD: 17,2a
       ADDRMD: 32,64
-      
-    # TODO: Both Cygwins have problems with <link.h> and `dladdr`
-    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #  ADDPATH: C:\cygwin\bin;
-    #  TOOLSET: gcc
-    #  CXXSTD: 11,14,1z
-    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #  ADDPATH: C:\cygwin64\bin;
-    #  TOOLSET: gcc
-    #  CXXSTD: 11,14,1z
-    # MinGW 32 bit is not supported by boost system any more
-    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #  ADDPATH: C:\mingw\bin;
-    #  TOOLSET: gcc
-    #  CXXSTD: 11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      ADDPATH: C:\Qt\6.8\msvc2022_64\bin;
       TOOLSET: gcc
-      CXXSTD: 11,14,1z
+      CXXSTD: 17,20
 
 before_build:
     - set BOOST_BRANCH=develop