diff --git a/MC/config/PWGGAJE/ini/GeneratorPythia8POWHEG_F2.ini b/MC/config/PWGGAJE/ini/GeneratorPythia8POWHEG_F2.ini
new file mode 100644
index 000000000..effba39eb
--- /dev/null
+++ b/MC/config/PWGGAJE/ini/GeneratorPythia8POWHEG_F2.ini
@@ -0,0 +1,9 @@
+### The external generator derives from GeneratorPythia8.
+## The generator allows to run Pythia8 with POWHEG
+#---> GeneratorPythia8POWHEG
+[GeneratorExternal]
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/generator/generator_pythia8_powheg.C
+funcName=getGeneratorJEPythia8POWHEG("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/powheg/powheg_beauty_F2.input")
+
+[GeneratorPythia8]
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/pythia8/generator/pythia8_powheg.cfg
diff --git a/MC/config/PWGGAJE/ini/GeneratorPythia8POWHEG_charm.ini b/MC/config/PWGGAJE/ini/GeneratorPythia8POWHEG_charm.ini
new file mode 100644
index 000000000..df8a6a1da
--- /dev/null
+++ b/MC/config/PWGGAJE/ini/GeneratorPythia8POWHEG_charm.ini
@@ -0,0 +1,9 @@
+### The external generator derives from GeneratorPythia8.
+## The generator allows to run Pythia8 with POWHEG
+#---> GeneratorPythia8POWHEG
+[GeneratorExternal]
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/generator/generator_pythia8_powheg.C
+funcName=getGeneratorJEPythia8POWHEG("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/external/powheg/powheg_charm_default.input")
+
+[GeneratorPythia8]
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGGAJE/pythia8/generator/pythia8_powheg.cfg
diff --git a/test/run_generator_tests.sh b/test/run_generator_tests.sh
index 9024d4aed..551f61261 100755
--- a/test/run_generator_tests.sh
+++ b/test/run_generator_tests.sh
@@ -64,7 +64,16 @@ get_test_script_path_for_ini()
 {
     local ini_path=${1}
     local test_script=$(basename ${ini_path})
-    echo $(dirname ${ini_path})/tests/${test_script%.ini}.C
+    local path_to_test_script=$(dirname ${ini_path})/tests/${test_script%.ini}.C
+    if [[ ! -f ${path_to_test_script} ]] ; then
+        # Check if test redirection is applied inside the ini_path file using the #---> syntax
+        local redirection=$(grep "#--->" ${ini_path})
+        if [[ "${redirection}" != "" ]] ; then
+            test_script=$(echo ${redirection} | awk '{print $2}')
+            path_to_test_script=$(dirname ${ini_path})/tests/${test_script}.C
+        fi
+    fi
+    echo ${path_to_test_script}
 }