diff --git a/tests/runtest.sh b/tests/runtest.sh
index 5e725c5..705545f 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -23,6 +23,7 @@ TPM2_ABRMD=tpm2-abrmd
 TPM2_SIM=swtpm
 TPM2_TOOLS_TEST_FIXTURES=`pwd`/tpm2-tools/test/integration/fixtures
 PATH=`pwd`/ibmtpm/src/:.:$PATH
+AUTOMAKE_VERSION=`rpm -q automake --qf '%{VERSION}' | cut -d. -f-2`
 export TPM2_ABRMD TPM2_SIM TPM2_TOOLS_TEST_FIXTURES PATH
 
 pushd tpm2-tools/test/integration
@@ -30,7 +31,7 @@ for t in `ls tests/*.sh`
 do
     f=`basename $t`
     test=${f%%.*}
-    /usr/share/automake-1.16/test-driver --test-name $test --log-file $test.log --trs-file $test.trs $t
+    /usr/share/automake-${AUTOMAKE_VERSION}/test-driver --test-name $test --log-file $test.log --trs-file $test.trs $t
 done
 all=`grep ":test-result:" *.trs | wc -l`;
 pass=`grep ":test-result: PASS"  *.trs | wc -l`;
diff --git a/tests/tests.fmf b/tests/tests.fmf
index bcbe86c..1a4db94 100644
--- a/tests/tests.fmf
+++ b/tests/tests.fmf
@@ -4,6 +4,9 @@ component: tpm2-tss
 require:
   - wget
   - git
+  - automake
+  - tpm2-abrmd
+  - tpm2-tools
 test: sh ./runtest.sh
 framework: shell
 duration: 60m