diff --git a/.cirrus.yml b/.cirrus.yml
index fb8b694..5e3d353 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -6,18 +6,19 @@ freebsd_12_task:
     image: freebsd-12-0-release-amd64
   install_script:
     - pkg install -y autoconf automake
-  basic_script:
     - ./package/setup-configure
+  basic_script:
+    - "[ -f Makefile ] && make distclean"
     - ./configure || { cat config.log; exit 1; }
     - make
     - make test
   uds_script:
-    - ./package/setup-configure
+    - "[ -f Makefile ] && make distclean"
     - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
     - make
     - make test
   pam_ssl_script:
-    - ./package/setup-configure
+    - "[ -f Makefile ] && make distclean"
     - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
     - make
     - make test
@@ -25,18 +26,20 @@ freebsd_12_task:
 linux_gcc_task:
   container:
     image: gcc:latest
-  basic_script:
+  install_script:
     - ./package/setup-configure
+  basic_script:
+    - "[ -f Makefile ] && make distclean"
     - ./configure || { cat config.log; exit 1; }
     - make
     - make test
   uds_script:
-    - ./package/setup-configure
+    - "[ -f Makefile ] && make distclean"
     - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
     - make
     - make test
   pam_ssl_script:
-    - ./package/setup-configure
+    - "[ -f Makefile ] && make distclean"
     - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
     - make
     - make test
@@ -46,18 +49,19 @@ linux_gcc_task:
 #    image: mojave-xcode-10.1
 #  install_script:
 #    - brew install autoconf automake
-#  basic_script:
 #    - ./package/setup-configure
+#  basic_script:
+#    - "[ -f Makefile ] && make distclean"
 #    - ./configure || { cat config.log; exit 1; }
 #    - make
 #    - make test
 #  uds_script:
-#    - ./package/setup-configure
+#    - "[ -f Makefile ] && make distclean"
 #    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
 #    - make
 #    - make test
 #  pam_ssl_script:
-#    - ./package/setup-configure
+#    - "[ -f Makefile ] && make distclean"
 #    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
 #    - make
 #    - make test