diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a73c0932..74c539020 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -631,22 +631,20 @@ set(FILESYSTEM_FOUND FALSE)
 if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17)
     # Check if we have std::filesystem
     if(NOT (CMAKE_VERSION VERSION_LESS 3.8))
-        if((NOT ENABLE_UNIT_TESTING_EXTRA) AND (NOT ENABLE_SYSTEM_TESTING_EXTRA) AND (NOT ENABLE_FPGA)) # Workaround for GPSTk
-            find_package(FILESYSTEM COMPONENTS Final Experimental)
-            set_package_properties(FILESYSTEM PROPERTIES
-                URL "https://en.cppreference.com/w/cpp/filesystem"
-                DESCRIPTION "Provides facilities for performing operations on file systems and their components"
-                PURPOSE "Work with paths, regular files, and directories."
-                TYPE OPTIONAL
-            )
-            if(${FILESYSTEM_FOUND})
-                if(CMAKE_VERSION VERSION_LESS 3.12)
-                    set(CMAKE_CXX_STANDARD 17)
-                else()
-                    set(CMAKE_CXX_STANDARD 20)
-                endif()
-                set(CMAKE_CXX_STANDARD_REQUIRED ON)
+        find_package(FILESYSTEM COMPONENTS Final Experimental)
+        set_package_properties(FILESYSTEM PROPERTIES
+            URL "https://en.cppreference.com/w/cpp/filesystem"
+            DESCRIPTION "Provides facilities for performing operations on file systems and their components"
+            PURPOSE "Work with paths, regular files, and directories."
+            TYPE OPTIONAL
+        )
+        if(${FILESYSTEM_FOUND})
+            if(CMAKE_VERSION VERSION_LESS 3.12)
+                set(CMAKE_CXX_STANDARD 17)
+            else()
+                set(CMAKE_CXX_STANDARD 20)
             endif()
+            set(CMAKE_CXX_STANDARD_REQUIRED ON)
         endif()
     endif()
 endif()