diff --git a/test/Makefile.am b/test/Makefile.am
index 2026535..ed9fefe 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -44,5 +44,3 @@
 	test_version.cpp \
 	test_item_updater_static.cpp \
 	msl_verify.cpp
-
-utest_LDADD = -lstdc++fs
diff --git a/test/test_signature.cpp b/test/test_signature.cpp
index 9e8de4b..f852382 100644
--- a/test/test_signature.cpp
+++ b/test/test_signature.cpp
@@ -2,7 +2,7 @@
 
 #include <openssl/sha.h>
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <string>
 
 #include <gtest/gtest.h>
@@ -26,7 +26,7 @@
     virtual void SetUp()
     {
         // Create test base directory.
-        fs::create_directories(testPath);
+        std::filesystem::create_directories(testPath);
 
         // Create unique temporary path for images.
         std::string tmpDir(testPath);
@@ -90,9 +90,9 @@
         command("rm -rf " + std::string(testPath));
     }
     std::unique_ptr<Signature> signature;
-    fs::path extractPath;
-    fs::path signedConfPath;
-    fs::path signedConfPNORPath;
+    std::filesystem::path extractPath;
+    std::filesystem::path signedConfPath;
+    std::filesystem::path signedConfPNORPath;
 };
 
 /** @brief Test for success scenario*/