diff --git a/integtest/3ru_1df_multirun_test.py b/integtest/3ru_1df_multirun_test.py
index c0388a0..a9359e3 100644
--- a/integtest/3ru_1df_multirun_test.py
+++ b/integtest/3ru_1df_multirun_test.py
@@ -93,7 +93,7 @@
 
 swtpg_conf = copy.deepcopy(conf_dict)
 swtpg_conf["readout"]["enable_software_tpg"] = True
-swtpg_conf["dataflow"]["apps"][0]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
+swtpg_conf["dataflow"]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
 
 dqm_conf = copy.deepcopy(conf_dict)
 dqm_conf["dqm"]["enable_dqm"] = True
diff --git a/integtest/3ru_3df_multirun_test.py b/integtest/3ru_3df_multirun_test.py
index e579923..bb6f7d5 100644
--- a/integtest/3ru_3df_multirun_test.py
+++ b/integtest/3ru_3df_multirun_test.py
@@ -84,8 +84,7 @@
 
 swtpg_conf = copy.deepcopy(conf_dict)
 swtpg_conf["readout"]["enable_software_tpg"] = True
-for df_app in range(number_of_dataflow_apps):
-    swtpg_conf["dataflow"]["apps"][df_app]["token_count"] = int(math.ceil(max(10, 3*number_of_data_producers*number_of_readout_apps)/number_of_dataflow_apps))
+swtpg_conf["dataflow"]["token_count"] = int(math.ceil(max(10, 3*number_of_data_producers*number_of_readout_apps)/number_of_dataflow_apps))
 
 dqm_conf = copy.deepcopy(conf_dict)
 dqm_conf["dqm"]["enable_dqm"] = True
diff --git a/integtest/long_window_readout_test.py b/integtest/long_window_readout_test.py
index fbdba43..c7ef4b4 100644
--- a/integtest/long_window_readout_test.py
+++ b/integtest/long_window_readout_test.py
@@ -85,6 +85,7 @@
 conf_dict["trigger"]["trigger_window_before_ticks"] = readout_window_time_before
 conf_dict["trigger"]["trigger_window_after_ticks"] = readout_window_time_after
 
+conf_dict["dataflow"]["token_count"] = token_count
 conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
 for df_app in range(number_of_dataflow_apps):
     dfapp_conf = {}
diff --git a/integtest/multi_output_file_test.py b/integtest/multi_output_file_test.py
index 4255e67..6e1a96a 100644
--- a/integtest/multi_output_file_test.py
+++ b/integtest/multi_output_file_test.py
@@ -75,7 +75,7 @@
 
 swtpg_conf = copy.deepcopy(conf_dict)
 swtpg_conf["readout"]["enable_software_tpg"] = True
-swtpg_conf["dataflow"]["apps"][0]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
+swtpg_conf["dataflow"]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
 
 confgen_arguments={"WIB1_System": conf_dict,
                    "Software_TPG_System": swtpg_conf,
diff --git a/integtest/tpstream_writing_test.py b/integtest/tpstream_writing_test.py
index 8b76567..113ae19 100644
--- a/integtest/tpstream_writing_test.py
+++ b/integtest/tpstream_writing_test.py
@@ -1,6 +1,7 @@
 import pytest
 import os
 import re
+import math
 import urllib.request
 
 import dfmodules.data_file_checks as data_file_checks
@@ -83,12 +84,12 @@
 conf_dict["trigger"]["tpset_output_path"] = output_dir
 conf_dict["readout"]["enable_software_tpg"] = True
 
+conf_dict["dataflow"]["token_count"] = int(math.ceil(max(10, 3*number_of_data_producers*number_of_readout_apps)/number_of_dataflow_apps))
 conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
 for df_app in range(number_of_dataflow_apps):
     dfapp_conf = {}
     dfapp_conf["app_name"] = f"dataflow{df_app}"
     dfapp_conf["output_path"] = output_dir
-    dfapp_conf["token_count"] = 3*number_of_readout_apps
     conf_dict["dataflow"]["apps"].append(dfapp_conf)
 
 confgen_arguments={"Software_TPG_System": conf_dict                  }
diff --git a/integtest/z.insufficient_disk_space_test.not_yet_working b/integtest/z.insufficient_disk_space_test.not_yet_working
index ea21b9b..91c62c7 100644
--- a/integtest/z.insufficient_disk_space_test.not_yet_working
+++ b/integtest/z.insufficient_disk_space_test.not_yet_working
@@ -80,6 +80,7 @@ conf_dict["trigger"]["trigger_rate_hz"] = trigger_rate
 conf_dict["trigger"]["trigger_window_before_ticks"] = readout_window_time_before
 conf_dict["trigger"]["trigger_window_after_ticks"] = readout_window_time_after
 
+conf_dict["dataflow"]["token_count"] = token_count
 conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
 for df_app in range(number_of_dataflow_apps):
     dfapp_conf = {}
diff --git a/integtest/z.large_trigger_record_test.not_yet_working b/integtest/z.large_trigger_record_test.not_yet_working
index b53109f..8baad51 100644
--- a/integtest/z.large_trigger_record_test.not_yet_working
+++ b/integtest/z.large_trigger_record_test.not_yet_working
@@ -62,6 +62,7 @@ conf_dict["trigger"]["trigger_rate_hz"] = trigger_rate
 conf_dict["trigger"]["trigger_window_before_ticks"] = readout_window_time_before
 conf_dict["trigger"]["trigger_window_after_ticks"] = readout_window_time_after
 
+conf_dict["dataflow"]["token_count"] = token_count
 conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
 for df_app in range(number_of_dataflow_apps):
     dfapp_conf = {}