diff --git a/test/Makefile.am b/test/Makefile.am
index d728099..3d63748 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,7 +25,7 @@
 					$(PHOSPHOR_LOGGING_CFLAGS) \
 					$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
 
-generic_ld_flags =  -lgtest_main -lgtest -lgmock -lstdc++fs \
+generic_ld_flags =  -lgtest_main -lgtest -lgmock \
 					$(OESDK_TESTCASE_FLAGS) \
 					$(SYSTEMD_LIBS) \
 					$(SDBUSPLUS_LIBS) \
diff --git a/test/test_network_manager.cpp b/test/test_network_manager.cpp
index 7943057..df7db77 100644
--- a/test/test_network_manager.cpp
+++ b/test/test_network_manager.cpp
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #include <exception>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <sdbusplus/bus.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
 
@@ -21,7 +21,7 @@
 std::unique_ptr<Timer> refreshObjectTimer = nullptr;
 std::unique_ptr<Timer> restartTimer = nullptr;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 class TestNetworkManager : public testing::Test
 {
diff --git a/test/test_vlan_interface.cpp b/test/test_vlan_interface.cpp
index 1dffc7e..76c0828 100644
--- a/test/test_vlan_interface.cpp
+++ b/test/test_vlan_interface.cpp
@@ -9,7 +9,7 @@
 #include <netinet/in.h>
 
 #include <exception>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <sdbusplus/bus.hpp>
 
 #include <gtest/gtest.h>
@@ -19,7 +19,7 @@
 namespace network
 {
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 class TestVlanInterface : public testing::Test
 {