diff --git a/test/System/FileInputStream.cpp b/test/System/FileInputStream.cpp
index 4bbd069dd..7eab360d8 100644
--- a/test/System/FileInputStream.cpp
+++ b/test/System/FileInputStream.cpp
@@ -16,8 +16,6 @@ TEST_CASE("sf::FileInputStream class - [system]")
         CHECK(fis.tell() == -1);
     }
 
-// Work around GCC 8.x bug with `<filesystem>`.
-#if !defined(__GNUC__) || (__GNUC__ >= 9)
     SUBCASE("Temporary file stream")
     {
         const std::string fileContents = "hello world";
@@ -40,5 +38,4 @@ TEST_CASE("sf::FileInputStream class - [system]")
             CHECK(std::string_view(buffer, 6) == std::string_view(fileContents.c_str() + 5, 6));
         }
     }
-#endif // !defined(__GNUC__) || (__GNUC__ >= 9)
 }
diff --git a/test/TestUtilities/SystemUtil.cpp b/test/TestUtilities/SystemUtil.cpp
index a6f862b5c..da511d6c5 100644
--- a/test/TestUtilities/SystemUtil.cpp
+++ b/test/TestUtilities/SystemUtil.cpp
@@ -4,12 +4,8 @@
 #include <SFML/System/String.hpp>
 #include <SFML/System/Time.hpp>
 
-// Work around GCC 8.x bug with `<filesystem>`.
-#if !defined(__GNUC__) || (__GNUC__ >= 9)
-#include <filesystem>
-#endif // !defined(__GNUC__) || (__GNUC__ >= 9)
-
 #include <cassert>
+#include <filesystem>
 #include <fstream>
 #include <iomanip>
 #include <limits>
@@ -38,8 +34,6 @@ namespace sf
     }
 }
 
-// Work around GCC 8.x bug with `<filesystem>`.
-#if !defined(__GNUC__) || (__GNUC__ >= 9)
 namespace sf::Testing
 {
     static std::string getTemporaryFilePath()
@@ -78,4 +72,3 @@ namespace sf::Testing
         return m_path;
     }
 }
-#endif // !defined(__GNUC__) || (__GNUC__ >= 9)
diff --git a/test/TestUtilities/SystemUtil.hpp b/test/TestUtilities/SystemUtil.hpp
index 5b30f7cad..b61395953 100644
--- a/test/TestUtilities/SystemUtil.hpp
+++ b/test/TestUtilities/SystemUtil.hpp
@@ -39,8 +39,6 @@ namespace sf
     }
 }
 
-// Work around GCC 8.x bug with `<filesystem>`.
-#if !defined(__GNUC__) || (__GNUC__ >= 9)
 namespace sf::Testing
 {
     class TemporaryFile
@@ -63,6 +61,5 @@ namespace sf::Testing
         const std::string& getPath() const;
     };
 }
-#endif // !defined(__GNUC__) || (__GNUC__ >= 9)
 
 #endif // SFML_TESTUTILITIES_SYSTEM_HPP