diff --git a/dasharo-security/measured-boot.robot b/dasharo-security/measured-boot.robot
index 462cf9c8c..a5fbd063a 100644
--- a/dasharo-security/measured-boot.robot
+++ b/dasharo-security/measured-boot.robot
@@ -10,8 +10,8 @@ Library             RequestsLibrary
 # stuff in all test cases
 Resource            ../variables.robot
 Resource            ../keywords.robot
-Resource            ../keys.robot
 Resource            ../lib/tpm.robot
+Resource            ../keys.robot
 
 # TODO:
 # - document which setup/teardown keywords to use and what are they doing
@@ -301,8 +301,10 @@ Measured Boot Suite Setup
     Prepare Test Suite
     Skip If    not ${MEASURED_BOOT_SUPPORT}    Measured boot is not supported
     Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    Tests in Ubuntu are not supported
+    Skip If    '${TPM_EXPECTED_VERSION}' == '0'    TPM Version in platform config does not support this suite
     Power On
     Boot Ubuntu And Login To Root
+    Verify Presence Of TPM Via Sysfs
     Detect Or Install Package    tpm2-tools
     # Disable service that adds dbx certificates which could interfere with tests
     Execute Command In Terminal    systemctl disable secureboot-db.service
diff --git a/dasharo-security/tpm2-commands.robot b/dasharo-security/tpm2-commands.robot
index e7a57260a..70861607f 100644
--- a/dasharo-security/tpm2-commands.robot
+++ b/dasharo-security/tpm2-commands.robot
@@ -10,6 +10,7 @@ Library             RequestsLibrary
 # stuff in all test cases
 Resource            ../variables.robot
 Resource            ../keywords.robot
+Resource            ../lib/tpm.robot
 Resource            ../keys.robot
 
 # TODO:
@@ -264,9 +265,11 @@ TPM2 Suite Setup
     Prepare Test Suite
     Skip If    not ${TPM_SUPPORT}    TPM tests not supported
     Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    TPM commands tests supported only on Ubuntu
+    Skip If    '${TPM_EXPECTED_VERSION}' != '2'    TPM Version in platform config does not support this suite
     Power On
     Boot System Or From Connected Disk    ubuntu
     Login To Linux
+    Verify Presence Of TPM Via Sysfs
     Switch To Root User
     Detect Or Install Package    tpm2-tools
     ${passed}=    Run Keyword And Return Status