diff --git a/Generators/Pythia8_i/test/test_01_Z_tautau.sh b/Generators/Pythia8_i/test/test_01_Z_tautau.sh
index 0435ddc0dc8e2238934bcc2c5bd55848a797c6f1..deecb9faa332621fbaa9994deb143d44d9ac9859 100755
--- a/Generators/Pythia8_i/test/test_01_Z_tautau.sh
+++ b/Generators/Pythia8_i/test/test_01_Z_tautau.sh
@@ -16,9 +16,10 @@ Gen_tf.py --ecmEnergy=13000. --maxEvents=10000 --firstEvent=-1 --randomSeed=1234
 
 echo "art-result:$? Gen_tf"
 
-source `which setupRivet`
+asetup 22.6.1,AthGeneration
+source setupRivet
 
-python rootconvert.py MyOutput.yoda.gz
+python /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Pythia8i/rootconvert.py MyOutput.yoda.gz
 
 echo "art-result: $? convert"
 
diff --git a/Generators/Pythia8_i/test/test_02_minbias.sh b/Generators/Pythia8_i/test/test_02_minbias.sh
index abd918b4e44e04f3f6469566d2a4692806b33f5e..e5256e6fb912a15f00944b452b481305b5f3eba4 100755
--- a/Generators/Pythia8_i/test/test_02_minbias.sh
+++ b/Generators/Pythia8_i/test/test_02_minbias.sh
@@ -13,10 +13,11 @@
 
 Gen_tf.py --ecmEnergy=13000. --maxEvents=10000 --firstEvent=-1 --randomSeed=123456 --outputEVNTFile=EVNT.root --outputYODAFile=MyOutput.yoda.gz --postInclude=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Pythia8i/JO_MC/JO_MC_minbias.py --jobConfig=421113
 
-source setupRivet.sh
-
 echo "art-result:$? Gen_tf"
 
+asetup 22.6.1,AthGeneration
+source setupRivet
+
 python /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Pythia8i/rootconvert.py MyOutput.yoda.gz
 
 dcubeName = "Pythia8i"