diff --git a/BayesValidRox/tests/PA-A/model_exe.py b/BayesValidRox/tests/PA-A/model_exe.py
index 11a5707c15600c85469a0288e470d63af99f7881..a394a54b76e8864b92cdf6b1a8cf197c411607e1 100755
--- a/BayesValidRox/tests/PA-A/model_exe.py
+++ b/BayesValidRox/tests/PA-A/model_exe.py
@@ -68,9 +68,8 @@ if Process1 != 0:
 
 # Extract velocity and pressure values with pvpython
 if model == 'stokespnm' and not averaging:
-    Command = "pvpython ../extractpointdataovertime.py \
-        -f "+pvdfile1+".pvd "+pvdfile2+".pvd\
-        -p "
+    Command = "pvpython ../models/{}/extractdata.py \
+        -f {}.pvd {}.pvd -p ".format(model_dir,pvdfile1,pvdfile2)
 
     Process2 = os.system(Command + velocity_points)
     if Process2 != 0:
diff --git a/BayesValidRox/tests/PA-A/extractpointdataovertime.py b/BayesValidRox/tests/PA-A/models/stokespnm/extractdata.py
similarity index 100%
rename from BayesValidRox/tests/PA-A/extractpointdataovertime.py
rename to BayesValidRox/tests/PA-A/models/stokespnm/extractdata.py
diff --git a/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py b/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py
index c938b4de1873a7223165dd8acf2f045f3430c1e6..8294fbfd3a877b1a28023d9da269206d9f892a84 100755
--- a/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py
+++ b/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py
@@ -55,7 +55,7 @@ if averaging:
         print('\tIf value of \'%d\' is a non-zero value, then compilation problems \n' % Process4)
 else:
     # Extract velocity and pressure values with pvpython
-    Command = "pvpython ../../extractpointdataovertime.py \
+    Command = "pvpython extractdata.py \
         -f "+pvdfile1+".pvd "+pvdfile2+".pvd\
         -p "