diff --git a/src/utils.hpp b/src/utils.hpp
index a104ce2..5744e4a 100644
--- a/src/utils.hpp
+++ b/src/utils.hpp
@@ -2,7 +2,7 @@
 
 #include "types.hpp"
 
-#include <experimental/any>
+#include <any>
 #include <sdbusplus/bus.hpp>
 #include <set>
 #include <string>
@@ -14,11 +14,8 @@
 class UtilsInterface;
 
 using AssociationList = phosphor::software::updater::AssociationList;
-// Due to a libstdc++ bug, we got compile error using std::any with gmock.
-// A temporary workaround is to use std::experimental::any.
-// See details in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90415
-using std::experimental::any;
-using std::experimental::any_cast;
+using std::any;
+using std::any_cast;
 
 /**
  * @brief Get the implementation of UtilsInterface
diff --git a/test/test_activation.cpp b/test/test_activation.cpp
index f2cc1ef..8da5b2d 100644
--- a/test/test_activation.cpp
+++ b/test/test_activation.cpp
@@ -14,7 +14,7 @@
 using ::testing::Return;
 using ::testing::StrEq;
 
-using std::experimental::any;
+using std::any;
 
 class TestActivation : public ::testing::Test
 {
diff --git a/test/test_item_updater.cpp b/test/test_item_updater.cpp
index 6b92e38..dab6a57 100644
--- a/test/test_item_updater.cpp
+++ b/test/test_item_updater.cpp
@@ -14,7 +14,7 @@
 using ::testing::ReturnArg;
 using ::testing::StrEq;
 
-using std::experimental::any;
+using std::any;
 
 class TestItemUpdater : public ::testing::Test
 {