diff --git a/tests/instance-id.cpp b/tests/instance-id.cpp
index 3a4e89b..ae4102d 100644
--- a/tests/instance-id.cpp
+++ b/tests/instance-id.cpp
@@ -1,12 +1,11 @@
-#include "libpldm/instance-id.h"
+#include <libpldm/base.h>
+#include <libpldm/instance-id.h>
 
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <filesystem>
 
-#include "libpldm/base.h"
-
 #include <gtest/gtest.h>
 
 static constexpr auto pldmMaxInstanceIds = 32;
diff --git a/tests/libpldm_bios_table_test.cpp b/tests/libpldm_bios_table_test.cpp
index d42d126..54173b6 100644
--- a/tests/libpldm_bios_table_test.cpp
+++ b/tests/libpldm_bios_table_test.cpp
@@ -1,4 +1,8 @@
 #include <endian.h>
+#include <libpldm/base.h>
+#include <libpldm/bios.h>
+#include <libpldm/bios_table.h>
+#include <libpldm/utils.h>
 
 #include <algorithm>
 #include <cstdint>
@@ -8,11 +12,6 @@
 #include <utility>
 #include <vector>
 
-#include "libpldm/base.h"
-#include "libpldm/bios.h"
-#include "libpldm/bios_table.h"
-#include "libpldm/utils.h"
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
diff --git a/tests/libpldm_bios_test.cpp b/tests/libpldm_bios_test.cpp
index f744bee..3f64a2a 100644
--- a/tests/libpldm_bios_test.cpp
+++ b/tests/libpldm_bios_test.cpp
@@ -1,14 +1,13 @@
 #include <endian.h>
+#include <libpldm/base.h>
+#include <libpldm/bios.h>
+#include <libpldm/utils.h>
 
 #include <array>
 #include <cstdint>
 #include <cstring>
 #include <memory>
 
-#include "libpldm/base.h"
-#include "libpldm/bios.h"
-#include "libpldm/utils.h"
-
 #include <gtest/gtest.h>
 
 constexpr auto hdrSize = sizeof(pldm_msg_hdr);
diff --git a/tests/libpldm_pdr_test.cpp b/tests/libpldm_pdr_test.cpp
index a6955a4..a5f62e7 100644
--- a/tests/libpldm_pdr_test.cpp
+++ b/tests/libpldm_pdr_test.cpp
@@ -1,4 +1,6 @@
 #include <endian.h>
+#include <libpldm/pdr.h>
+#include <libpldm/platform.h>
 
 #include <array>
 #include <cstdint>
@@ -6,9 +8,6 @@
 #include <cstring>
 #include <vector>
 
-#include "libpldm/pdr.h"
-#include "libpldm/platform.h"
-
 #include <gtest/gtest.h>
 
 TEST(PDRAccess, testInit)
diff --git a/tests/transport.cpp b/tests/transport.cpp
index 3fc783f..41ef42e 100644
--- a/tests/transport.cpp
+++ b/tests/transport.cpp
@@ -1,4 +1,4 @@
-#include "libpldm/transport.h"
+#include <libpldm/transport.h>
 
 #include "array.h"
 #include "transport/test.h"
diff --git a/tests/transport/send_recv_one.cpp b/tests/transport/send_recv_one.cpp
index f411e48..ac466f5 100644
--- a/tests/transport/send_recv_one.cpp
+++ b/tests/transport/send_recv_one.cpp
@@ -1,5 +1,6 @@
+#include <libpldm/transport.h>
+
 #include "array.h"
-#include "libpldm/transport.h"
 #include "transport/test.h"
 
 #include <gtest/gtest.h>
diff --git a/tests/transport/send_recv_timeout.cpp b/tests/transport/send_recv_timeout.cpp
index d2d6853..bec6b36 100644
--- a/tests/transport/send_recv_timeout.cpp
+++ b/tests/transport/send_recv_timeout.cpp
@@ -1,5 +1,6 @@
+#include <libpldm/transport.h>
+
 #include "array.h"
-#include "libpldm/transport.h"
 #include "transport/test.h"
 
 #include <gtest/gtest.h>
diff --git a/tests/transport/send_recv_unwanted.cpp b/tests/transport/send_recv_unwanted.cpp
index 7b3ebff..3d6fd7c 100644
--- a/tests/transport/send_recv_unwanted.cpp
+++ b/tests/transport/send_recv_unwanted.cpp
@@ -1,5 +1,6 @@
+#include <libpldm/transport.h>
+
 #include "array.h"
-#include "libpldm/transport.h"
 #include "transport/test.h"
 
 #include <gtest/gtest.h>
diff --git a/tests/transport/send_recv_wrong_command_code.cpp b/tests/transport/send_recv_wrong_command_code.cpp
index f40a82a..fcb0c9b 100644
--- a/tests/transport/send_recv_wrong_command_code.cpp
+++ b/tests/transport/send_recv_wrong_command_code.cpp
@@ -1,5 +1,6 @@
+#include <libpldm/transport.h>
+
 #include "array.h"
-#include "libpldm/transport.h"
 #include "transport/test.h"
 
 #include <gtest/gtest.h>
diff --git a/tests/transport/send_recv_wrong_pldm_type.cpp b/tests/transport/send_recv_wrong_pldm_type.cpp
index e57207d..287b6b2 100644
--- a/tests/transport/send_recv_wrong_pldm_type.cpp
+++ b/tests/transport/send_recv_wrong_pldm_type.cpp
@@ -1,5 +1,6 @@
+#include <libpldm/transport.h>
+
 #include "array.h"
-#include "libpldm/transport.h"
 #include "transport/test.h"
 
 #include <gtest/gtest.h>