diff --git a/tests/libpldm_bios_test.cpp b/tests/libpldm_bios_test.cpp
index aa95c66..f744bee 100644
--- a/tests/libpldm_bios_test.cpp
+++ b/tests/libpldm_bios_test.cpp
@@ -1,8 +1,8 @@
 #include <endian.h>
-#include <stdint.h>
-#include <string.h>
 
 #include <array>
+#include <cstdint>
+#include <cstring>
 #include <memory>
 
 #include "libpldm/base.h"
diff --git a/tests/libpldm_pdr_test.cpp b/tests/libpldm_pdr_test.cpp
index 2af2c34..6b99d5e 100644
--- a/tests/libpldm_pdr_test.cpp
+++ b/tests/libpldm_pdr_test.cpp
@@ -1,9 +1,9 @@
 #include <endian.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <array>
 #include <cstdint>
+#include <cstdlib>
+#include <cstring>
 #include <vector>
 
 #include "libpldm/pdr.h"
diff --git a/tests/libpldm_platform_test.cpp b/tests/libpldm_platform_test.cpp
index 396e9d9..d346067 100644
--- a/tests/libpldm_platform_test.cpp
+++ b/tests/libpldm_platform_test.cpp
@@ -1,8 +1,8 @@
 #include <endian.h>
-#include <string.h>
 
 #include <array>
 #include <cstdint>
+#include <cstring>
 #include <vector>
 
 #include "libpldm/base.h"
diff --git a/tests/oem/ibm/libpldm_fileio_test.cpp b/tests/oem/ibm/libpldm_fileio_test.cpp
index deba7b9..f3d7718 100644
--- a/tests/oem/ibm/libpldm_fileio_test.cpp
+++ b/tests/oem/ibm/libpldm_fileio_test.cpp
@@ -1,8 +1,8 @@
 #include <endian.h>
-#include <string.h>
 
 #include <array>
 #include <cstdint>
+#include <cstring>
 #include <vector>
 
 #include "libpldm/base.h"
diff --git a/tests/oem/ibm/libpldm_host_test.cpp b/tests/oem/ibm/libpldm_host_test.cpp
index 2ab03b7..60f5ada 100644
--- a/tests/oem/ibm/libpldm_host_test.cpp
+++ b/tests/oem/ibm/libpldm_host_test.cpp
@@ -1,8 +1,8 @@
 #include <endian.h>
-#include <string.h>
 
 #include <array>
 #include <cstdint>
+#include <cstring>
 #include <vector>
 
 #include "base.h"