diff --git a/tests/makephar.sh b/tests/makephar.sh
index 3ccd0e74..bd78cf65 100755
--- a/tests/makephar.sh
+++ b/tests/makephar.sh
@@ -40,9 +40,9 @@ echo '{
     ]
 }' > composer.json
 composer config platform.php "7.4"
-[ $PHP_MAJOR_VERSION -eq 5 ] && composer require dstuecken/php7ify
 composer clearcache
 composer update
+[ $PHP_MAJOR_VERSION -eq 5 ] && composer require dstuecken/php7ify
 composer dumpautoload --optimize
 cp -a $madelinePath/src vendor/danog/madelineproto/
 cd ..
@@ -57,7 +57,7 @@ cd ..
     [ -f $HOME/.config/composer/vendor/bin/php7to5 ] && php7to5=$HOME/.config/composer/vendor/bin/php7to5
 
     cd phar7
-    $madelinePath/tests/conversion/before-5.sh
+    $madelinePath/tests/conversion/prepare-5.sh
     cd ..
 
     php7.3 $php7to5 convert --copy-all phar7 phar5 >/dev/null
@@ -77,7 +77,7 @@ cd ..
         [ -f $HOME/.config/composer/vendor/bin/php7to70 ] && php7to70=$HOME/.config/composer/vendor/bin/php7to70
 
         cd phar7
-        $madelinePath/tests/conversion/before-70.sh
+        $madelinePath/tests/conversion/prepare-70.sh
         cd ..
 
         $php7to70 convert --copy-all phar7 phar5 >/dev/null
diff --git a/tests/test-conversion.sh b/tests/test-conversion.sh
index 5f6d68dc..c5ea18a1 100755
--- a/tests/test-conversion.sh
+++ b/tests/test-conversion.sh
@@ -36,7 +36,10 @@ echo '{
         }
     ]
 }' > composer.json
+composer config platform.php "7.4"
+#composer clearcache
 composer update
+composer dumpautoload --optimize
 
 $madelinePath/tests/conversion/prepare-$1.sh
 
@@ -46,7 +49,6 @@ mv newVendor vendor
 
 $madelinePath/tests/conversion/after-$1.sh
 
-composer dumpautoload --optimize
 
 cd $madelinePath
 if [ $1 -eq 5 ];then