diff --git a/.cirrus.yml b/.cirrus.yml
index 38715f474..25da665ad 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,7 +2,7 @@ task:
   env:
     CFLAGS: "-I/usr/local/include -I/usr/local/openssl/include"
     LDFLAGS: -L/usr/local/lib
-    ibmtpm_name: ibmtpm1637
+    ibmtpm_name: ibmtpm1682
     libusb_version: v1.0.26
   freebsd_instance:
     matrix:
@@ -14,7 +14,16 @@ task:
     - pkg install -y bash gmake coreutils libtool pkgconf autoconf autoconf-archive
     - pkg install -y automake openssl json-c cmocka uthash wget curl git util-linux
     - pkg install -y libftdi1
-    - pkg install -y swtpm
+    - wget --quiet --show-progress --progress=dot:giga "https://downloads.sourceforge.net/project/ibmswtpm2/$ibmtpm_name.tar.gz"
+    - shasum -a256 $ibmtpm_name.tar.gz | grep ^3cb642f871a17b23d50b046e5f95f449c2287415fc1e7aeb4bdbb8920dbcb38f
+    - mkdir -p $ibmtpm_name
+    - tar xvf $ibmtpm_name.tar.gz -C $ibmtpm_name && cd $ibmtpm_name/src
+    - sed -i '' -e 's/gcc/clang/g' makefile
+    - sed -i '' -e 's/-Wall //g' makefile
+    - sed -i '' -e 's/-Werror //g' makefile
+    - gmake -j && cp tpm_server /usr/bin/
+    - cd -
+    - rm -fr $ibmtpm_name $ibmtpm_name.tar.gz
     - git clone --depth 1 -b $libusb_version https://github.com/libusb/libusb
     - cd libusb && ./bootstrap.sh && ./configure && gmake -j install
     - cd - && rm -fr libusb
@@ -23,5 +32,5 @@ task:
     # Due to a race condition that only occurs in the cirrus ci, "make distcheck" has been replaced by "make check".
     #
     ./bootstrap &&
-    ./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=yes --enable-tcti-libtpms=no --enable-tcti-mssim=no --disable-dependency-tracking &&
-    gmake -j check || { cat /tmp/cirrus-ci-build/tpm2-tss-*/_build/sub/test-suite.log; exit 1; }
+   ./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=no --enable-tcti-libtpms=no --enable-tcti-mssim=yes --with-integrationtcti=mssim --enable-tcti-device=yes --disable-dependency-tracking &&
+    gmake -j check || { cat test-suite.log; exit 1; }