diff --git a/config/core/build-configs.yaml b/config/core/build-configs.yaml
index bed702d566..5d3fbfcdde 100644
--- a/config/core/build-configs.yaml
+++ b/config/core/build-configs.yaml
@@ -268,6 +268,7 @@ fragments:
       - 'CONFIG_TCG_TIS_I2C_CR50=y'
       - 'CONFIG_SPI=y'
       - 'CONFIG_SPI_PXA2XX=y'
+      - 'CONFIG_PINCTRL_AMD=y'
 
   x86_kvm_guest:
     path: "kernel/configs/kvm_guest.config"
diff --git a/config/core/rootfs-configs.yaml b/config/core/rootfs-configs.yaml
index f52576d5b5..2a684a3698 100644
--- a/config/core/rootfs-configs.yaml
+++ b/config/core/rootfs-configs.yaml
@@ -159,6 +159,9 @@ rootfs_configs:
       - perl-modules-5.32
       - procps
       - publicsuffix
+      - python3-minimal
+      - python3-unittest2
+      - tpm2-tools
       - wget
       - xz-utils
 
diff --git a/config/core/test-configs.yaml b/config/core/test-configs.yaml
index 4667c3892e..4f80bbdcd4 100644
--- a/config/core/test-configs.yaml
+++ b/config/core/test-configs.yaml
@@ -293,6 +293,12 @@ test_plans:
       job_timeout: '10'
       kselftest_collections: "seccomp"
 
+  kselftest-tpm2:
+    <<: *kselftest
+    params:
+      job_timeout: '10'
+      kselftest_collections: "tpm2"
+
   kselftest-vm:
     <<: *kselftest
     params:
@@ -1969,6 +1975,7 @@ test_configs:
       - kselftest-lkdtm
       - kselftest-rtc
       - kselftest-seccomp
+      - kselftest-tpm2
       - kselftest-vm
       - ltp-crypto
       - ltp-fcntl-locktests