diff --git a/.ci/system-tests/platform_cert_tests.sh b/.ci/system-tests/platform_cert_tests.sh
index 2652d69b..34ab1ee2 100644
--- a/.ci/system-tests/platform_cert_tests.sh
+++ b/.ci/system-tests/platform_cert_tests.sh
@@ -12,11 +12,15 @@ failedTests=0;
 # Note that the aca_policy_tests have already run several Platform Certificate system tests
 
 writeToLogs "### ACA PLATFORM CERTIFICATE TEST 1: Test a delta Platform Certificate that adds a new memory component ###"
+clearAcaDb
+uploadTrustedCerts
 setPolicyEkPc
 setPlatformCerts "laptop" "deltaPlatMem"
 provisionTpm2 "pass"
 
 writeToLogs "### ACA PLATFORM CERTIFICATE TEST 2: Test a Platform Certificate that is missing a memory component ###"
+clearAcaDb
+uploadTrustedCerts
 setPlatformCerts "laptop" "platCertLight"
 provisionTpm2 "pass"
 
diff --git a/.ci/system-tests/profiles/laptop/deltaPlatMem/dell5580-delta_mem_componentlist.json b/.ci/system-tests/profiles/laptop/deltaPlatMem/dell5580-delta_mem_componentlist.json
deleted file mode 100644
index 0cf0a94d..00000000
--- a/.ci/system-tests/profiles/laptop/deltaPlatMem/dell5580-delta_mem_componentlist.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "PLATFORM": {
-        "PLATFORMMANUFACTURERSTR": "Dell Inc.","PLATFORMMODEL": "Latitude 5580","PLATFORMVERSION": "Not Specified","PLATFORMSERIAL": "56LMWD2"
-    },
-    "COMPONENTS": [
-       {
-            "COMPONENTCLASS": {
-       "COMPONENTCLASSREGISTRY": "2.23.133.18.3.1",
-       "COMPONENTCLASSVALUE": "00060001"
-   },"MANUFACTURER": "80AD000080AD","MODEL": "HMA81GS6AFR8N-UH","FIELDREPLACEABLE": "true","SERIAL": "29AC274B","REVISION": "01172200","STATUS": "added"
-        }
-    ],
-    "PROPERTIES": [
-        {
-            "NAME": "uname -r",
-            "VALUE": "4.14.165-133.209.amzn2.x86_64"
-        },
-        {
-            "NAME": "OS Release",
-            "VALUE": "CentOS Linux 7 (Core)"
-        }
-    ]
-}
-
diff --git a/.ci/system-tests/profiles/laptop/deltaPlatMem/dell5580_base-componentlist.json b/.ci/system-tests/profiles/laptop/deltaPlatMem/dell5580_base-componentlist.json
deleted file mode 100644
index ebf81401..00000000
--- a/.ci/system-tests/profiles/laptop/deltaPlatMem/dell5580_base-componentlist.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    
-    "PLATFORM": {
-        "PLATFORMMANUFACTURERSTR": "Dell Inc.","PLATFORMMODEL": "Latitude 5580","PLATFORMVERSION": "Not Specified","PLATFORMSERIAL": "56LMWD2"
-    },
-    "COMPONENTS": [
-        {
-             "COMPONENTCLASS": {
-        "COMPONENTCLASSREGISTRY": "2.23.133.18.3.1",
-        "COMPONENTCLASSVALUE": "00020001"
-    },"MANUFACTURER": "Dell Inc.","MODEL": "10","SERIAL": "56LMWD2"
-        },
-        {
-             "COMPONENTCLASS": {
-        "COMPONENTCLASSREGISTRY": "2.23.133.18.3.1",
-        "COMPONENTCLASSVALUE": "00030003"
-    },"MANUFACTURER": "Dell Inc.","MODEL": "08T986","FIELDREPLACEABLE": "true","SERIAL": "/56LMWD2/TW320707A30298/","REVISION": "A00"
-        },
-        {
-             "COMPONENTCLASS": {
-        "COMPONENTCLASSREGISTRY": "2.23.133.18.3.1",
-        "COMPONENTCLASSVALUE": "00130003"
-    },"MANUFACTURER": "Dell Inc.","MODEL": "Not Specified","REVISION": "1.5.3"
-        },
-       {
-            "COMPONENTCLASS": {
-       "COMPONENTCLASSREGISTRY": "2.23.133.18.3.1",
-       "COMPONENTCLASSVALUE": "00010002"
-   },"MANUFACTURER": "Intel(R) Corporation","MODEL": "198","FIELDREPLACEABLE": "true","SERIAL": "To Be Filled By O.E.M.","REVISION": "Intel(R) Core(TM) i7-7820HQ CPU @ 2.90GHz"
-       },
-       {
-            "COMPONENTCLASS": {
-       "COMPONENTCLASSREGISTRY": "2.23.133.18.3.1",
-       "COMPONENTCLASSVALUE": "00060001"
-   },"MANUFACTURER": "80AD000080AD","MODEL": "HMA81GS6AFR8N-UH","FIELDREPLACEABLE": "true","SERIAL": "29AC2764","REVISION": "01172200"
-       }
-    ],
-    "PROPERTIES": [
-        {
-            "NAME": "uname -r",
-            "VALUE": "4.14.165-133.209.amzn2.x86_64"
-        },
-        {
-            "NAME": "OS Release",
-            "VALUE": "CentOS Linux 7 (Core)"
-        }
-    ]
-}
-