diff --git a/apps/uefi/Bsa.inf b/apps/uefi/Bsa.inf
index 3c8eb0af..e5eb731a 100644
--- a/apps/uefi/Bsa.inf
+++ b/apps/uefi/Bsa.inf
@@ -127,10 +127,8 @@
   ../../test_pool/pcie/p042.c
   ../../test_pool/exerciser/e001.c
   ../../test_pool/exerciser/e002.c
-  ../../test_pool/exerciser/e003.c
   ../../test_pool/exerciser/e004.c
   ../../test_pool/exerciser/e006.c
-  ../../test_pool/exerciser/e007.c
   ../../test_pool/exerciser/e010.c
   ../../test_pool/exerciser/e011.c
   ../../test_pool/exerciser/e012.c
diff --git a/apps/uefi/Sbsa.inf b/apps/uefi/Sbsa.inf
index 3c4d9ab5..a5d73686 100644
--- a/apps/uefi/Sbsa.inf
+++ b/apps/uefi/Sbsa.inf
@@ -147,6 +147,8 @@
   ../../test_pool/pcie/p091.c
   ../../test_pool/pcie/p092.c
   ../../test_pool/pcie/p093.c
+  ../../test_pool/exerciser/e003.c
+  ../../test_pool/exerciser/e007.c
   ../../test_pool/exerciser/e008.c
   ../../test_pool/exerciser/e017.c
   ../../test_pool/exerciser/e019.c
diff --git a/apps/uefi/SbsaNist.inf b/apps/uefi/SbsaNist.inf
index 7afaf589..6034d631 100644
--- a/apps/uefi/SbsaNist.inf
+++ b/apps/uefi/SbsaNist.inf
@@ -146,6 +146,8 @@
   ../../test_pool/pcie/p091.c
   ../../test_pool/pcie/p092.c
   ../../test_pool/pcie/p093.c
+  ../../test_pool/exerciser/e003.c
+  ../../test_pool/exerciser/e007.c
   ../../test_pool/exerciser/e008.c
   ../../test_pool/exerciser/e017.c
   ../../test_pool/exerciser/e019.c
diff --git a/apps/uefi/Unified.inf b/apps/uefi/Unified.inf
index 5c077320..0adb6778 100644
--- a/apps/uefi/Unified.inf
+++ b/apps/uefi/Unified.inf
@@ -128,10 +128,8 @@
   ../../test_pool/pcie/p042.c
   ../../test_pool/exerciser/e001.c
   ../../test_pool/exerciser/e002.c
-  ../../test_pool/exerciser/e003.c
   ../../test_pool/exerciser/e004.c
   ../../test_pool/exerciser/e006.c
-  ../../test_pool/exerciser/e007.c
   ../../test_pool/exerciser/e010.c
   ../../test_pool/exerciser/e011.c
   ../../test_pool/exerciser/e012.c
@@ -256,6 +254,8 @@
   ../../test_pool/pcie/p091.c
   ../../test_pool/pcie/p092.c
   ../../test_pool/pcie/p093.c
+  ../../test_pool/exerciser/e003.c
+  ../../test_pool/exerciser/e007.c
   ../../test_pool/exerciser/e008.c
   ../../test_pool/exerciser/e019.c
   ../../test_pool/exerciser/e020.c
diff --git a/docs/bsa/arm_bsa_testcase_checklist.rst b/docs/bsa/arm_bsa_testcase_checklist.rst
index 849594ee..ffb3accf 100644
--- a/docs/bsa/arm_bsa_testcase_checklist.rst
+++ b/docs/bsa/arm_bsa_testcase_checklist.rst
@@ -237,14 +237,10 @@ The below table provides the following details
 +-------+--------------------------------------------+-----+------------------------------------------------------------+-----+-----+-----+-----+----------+-----+-------------------+
 |1502   |Check ACS Redirect Req Valid                |L1   |PCI_PP_04                                                   |No   |No   |No   |Yes  |Yes       |No   |Yes                |
 +-------+--------------------------------------------+-----+------------------------------------------------------------+-----+-----+-----+-----+----------+-----+-------------------+
-|1503   |Arrival order Check                         |L1   |PCI_IC_15                                                   |No   |No   |No   |Yes  |Yes       |No   |Yes                |
-+-------+--------------------------------------------+-----+------------------------------------------------------------+-----+-----+-----+-----+----------+-----+-------------------+
 |1504   |MSI-X triggers intr with unique ID          |L1   |ITS_DEV_6                                                   |No   |No   |No   |Yes  |Yes       |No   |Yes                |
 +-------+--------------------------------------------+-----+------------------------------------------------------------+-----+-----+-----+-----+----------+-----+-------------------+
 |1506   |Generate PCIe legacy interrupt              |L1   |PCI_LI_02                                                   |No   |No   |No   |Yes  |Yes       |No   |Yes                |
 +-------+--------------------------------------------+-----+------------------------------------------------------------+-----+-----+-----+-----+----------+-----+-------------------+
-|1507   |Check PCIe I/O Coherency                    |L1   |PCI_IC_11                                                   |No   |No   |No   |Yes  |Yes       |No   |Yes                |
-+-------+--------------------------------------------+-----+------------------------------------------------------------+-----+-----+-----+-----+----------+-----+-------------------+
 |1510   |Check RP Sec Bus transaction are TYPE0      |L1   |PCI_IN_11                                                   |No   |No   |No   |Yes  |Yes       |No   |Yes                |
 +-------+--------------------------------------------+-----+------------------------------------------------------------+-----+-----+-----+-----+----------+-----+-------------------+
 |1511   |MSI-capable device linked to ITS group      |L1   |ITS_03                                                      |No   |No   |No   |Yes  |Yes       |No   |Yes                |
diff --git a/docs/sbsa/arm_sbsa_testcase_checklist.rst b/docs/sbsa/arm_sbsa_testcase_checklist.rst
index b67e1d0b..376869ff 100644
--- a/docs/sbsa/arm_sbsa_testcase_checklist.rst
+++ b/docs/sbsa/arm_sbsa_testcase_checklist.rst
@@ -287,6 +287,10 @@ The below table provides the following details
 +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
 |904    |PCIe Normal Memory mapping support          |L6   |PCI_MM_03                                           |Yes             |Yes#|Yes       |Yes  |No                 |
 +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
+|1503   |Arrival order Check                         |L3   |PCI_IC_15                                           |No              |Yes |Yes       |No   |Yes                |
++-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
+|1507   |Check PCIe I/O Coherency                    |L3   |PCI_IC_11                                           |No              |Yes |Yes       |No   |Yes                |
++-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
 |1508   |Tx pending bit clear correctness RCiEP      |L6   |RE_ORD_4                                            |No              |Yes |Yes       |No   |Yes                |
 +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+
 |1519   |PCIe Address translation check              |L6   |RE_SMU_2                                            |No              |Yes |Yes       |No   |Yes                |
diff --git a/tools/cmake/infra/bsa_test.txt b/tools/cmake/infra/bsa_test.txt
index febfff4c..08b58e34 100644
--- a/tools/cmake/infra/bsa_test.txt
+++ b/tools/cmake/infra/bsa_test.txt
@@ -103,10 +103,8 @@ p097.c
 p105.c
 e001.c
 e002.c
-e003.c
 e004.c
 e006.c
-e007.c
 e010.c
 e011.c
 e012.c
@@ -117,4 +115,4 @@ e016.c
 e017.c
 e033.c
 e035.c
-e039.c
\ No newline at end of file
+e039.c
diff --git a/tools/cmake/infra/sbsa_test.txt b/tools/cmake/infra/sbsa_test.txt
index a5de4a6d..a95d66c0 100644
--- a/tools/cmake/infra/sbsa_test.txt
+++ b/tools/cmake/infra/sbsa_test.txt
@@ -112,6 +112,8 @@ p091.c
 p092.c
 p093.c
 p094.c
+e003.c
+e007.c
 e008.c
 e017.c
 e019.c
diff --git a/val/src/bsa_execute_test.c b/val/src/bsa_execute_test.c
index 293c5c17..8c7dcd3d 100644
--- a/val/src/bsa_execute_test.c
+++ b/val/src/bsa_execute_test.c
@@ -878,10 +878,8 @@ val_bsa_exerciser_execute_tests(uint32_t *g_sw_view)
          view_print_info(OPERATING_SYSTEM);
          status |= e001_entry();
          status |= e002_entry();
-         status |= e003_entry();
          status |= e004_entry();
          status |= e006_entry();
-         status |= e007_entry();
          status |= e010_entry();
 
          if (!pal_target_is_dt()) {
diff --git a/val/src/sbsa_execute_test.c b/val/src/sbsa_execute_test.c
index 2b5570f1..e8f94105 100644
--- a/val/src/sbsa_execute_test.c
+++ b/val/src/sbsa_execute_test.c
@@ -658,6 +658,11 @@ val_sbsa_exerciser_execute_tests(uint32_t level)
 
   g_curr_module = 1 << EXERCISER_MODULE;
 
+  if (((level > 2) && (g_sbsa_only_level == 0)) || (g_sbsa_only_level == 3)) {
+      status |= e003_entry();
+      status |= e007_entry();
+  }
+
   if (((level > 5) && (g_sbsa_only_level == 0)) || (g_sbsa_only_level == 6)) {
       status |= e008_entry();
       status |= e019_entry();