diff --git a/tests/libpldm_base_test.cpp b/tests/libpldm_base_test.cpp
index 20289fc..ae4b87e 100644
--- a/tests/libpldm_base_test.cpp
+++ b/tests/libpldm_base_test.cpp
@@ -1,11 +1,11 @@
+#include <libpldm/base.h>
+#include <libpldm/pldm_types.h>
+
 #include <array>
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include "libpldm/base.h"
-#include "pldm_types.h"
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
diff --git a/tests/libpldm_firmware_update_test.cpp b/tests/libpldm_firmware_update_test.cpp
index a9316a7..9a84b3f 100644
--- a/tests/libpldm_firmware_update_test.cpp
+++ b/tests/libpldm_firmware_update_test.cpp
@@ -1,4 +1,8 @@
 #include <endian.h>
+#include <libpldm/base.h>
+#include <libpldm/firmware_update.h>
+#include <libpldm/pldm_types.h>
+#include <libpldm/utils.h>
 
 #include <algorithm>
 #include <array>
@@ -9,11 +13,6 @@
 #include <string_view>
 #include <vector>
 
-#include "libpldm/base.h"
-#include "libpldm/firmware_update.h"
-#include "pldm_types.h"
-#include "utils.h"
-
 #include <gtest/gtest.h>
 
 constexpr auto hdrSize = sizeof(pldm_msg_hdr);
diff --git a/tests/libpldm_fru_test.cpp b/tests/libpldm_fru_test.cpp
index e1d2a11..7567683 100644
--- a/tests/libpldm_fru_test.cpp
+++ b/tests/libpldm_fru_test.cpp
@@ -1,14 +1,13 @@
 #include <endian.h>
+#include <libpldm/base.h>
+#include <libpldm/fru.h>
+#include <libpldm/utils.h>
 
 #include <array>
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include "libpldm/base.h"
-#include "libpldm/fru.h"
-#include "utils.h"
-
 #include <gtest/gtest.h>
 
 TEST(GetFruRecordTableMetadata, testGoodEncodeRequest)
diff --git a/tests/libpldm_platform_test.cpp b/tests/libpldm_platform_test.cpp
index 834c778..a3ce592 100644
--- a/tests/libpldm_platform_test.cpp
+++ b/tests/libpldm_platform_test.cpp
@@ -1,15 +1,15 @@
 #include <endian.h>
+#include <libpldm/base.h>
+#include <libpldm/entity.h>
+#include <libpldm/platform.h>
+#include <libpldm/pldm_types.h>
 
 #include <array>
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include "libpldm/base.h"
-#include "libpldm/entity.h"
-#include "libpldm/platform.h"
 #include "msgbuf.h"
-#include "pldm_types.h"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/libpldm_utils_test.cpp b/tests/libpldm_utils_test.cpp
index 663a531..88b8c8e 100644
--- a/tests/libpldm_utils_test.cpp
+++ b/tests/libpldm_utils_test.cpp
@@ -1,9 +1,9 @@
+#include <libpldm/pldm_types.h>
+#include <libpldm/utils.h>
+
 #include <cstring>
 #include <vector>
 
-#include "libpldm/utils.h"
-#include "pldm_types.h"
-
 #include <gtest/gtest.h>
 
 TEST(Crc32, CheckSumTest)
diff --git a/tests/meson.build b/tests/meson.build
index 3b6b7e2..76ca6ee 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -45,12 +45,12 @@
   ]
 endif
 
-src_includes = include_directories('..' / 'src', '..' / 'include' / 'libpldm')
+test_include_dirs = [ libpldm_include_dir, include_directories('../src') ]
 
 foreach t : tests
   test(t, executable(t.underscorify(), t + '.cpp',
                      implicit_include_directories: false,
-                     include_directories: src_includes,
+                     include_directories: test_include_dirs,
                      dependencies: [
                          libpldm_dep,
                          gtest_dep,
@@ -61,9 +61,9 @@
 test('bios_table_iter', executable('bios_table_iter',
                                    'bios_table_iter.c',
                                    implicit_include_directories: false,
-                                   include_directories: src_includes))
+                                   include_directories: test_include_dirs))
 
 test('msgbuf_generic', executable('msgbuf_generic',
                                   'msgbuf_generic.c',
                                   implicit_include_directories: false,
-                                  include_directories: src_includes))
+                                  include_directories: test_include_dirs))
diff --git a/tests/oem/ibm/libpldm_fileio_test.cpp b/tests/oem/ibm/libpldm_fileio_test.cpp
index f3d7718..3f9625e 100644
--- a/tests/oem/ibm/libpldm_fileio_test.cpp
+++ b/tests/oem/ibm/libpldm_fileio_test.cpp
@@ -1,13 +1,12 @@
 #include <endian.h>
+#include <libpldm/base.h>
+#include <libpldm/oem/ibm/libpldm/file_io.h>
 
 #include <array>
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include "libpldm/base.h"
-#include "libpldm/file_io.h"
-
 #include <gtest/gtest.h>
 
 constexpr auto hdrSize = sizeof(pldm_msg_hdr);
diff --git a/tests/oem/ibm/libpldm_host_test.cpp b/tests/oem/ibm/libpldm_host_test.cpp
index 60f5ada..11f92d3 100644
--- a/tests/oem/ibm/libpldm_host_test.cpp
+++ b/tests/oem/ibm/libpldm_host_test.cpp
@@ -1,13 +1,12 @@
 #include <endian.h>
+#include <libpldm/base.h>
+#include <libpldm/oem/ibm/libpldm/host.h>
 
 #include <array>
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include "base.h"
-#include "oem/ibm/libpldm/host.h"
-
 #include <gtest/gtest.h>
 
 constexpr auto hdrSize = sizeof(pldm_msg_hdr);