diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdb52f32586ecf52b0be9ce228ab7130be68b72a..75ecc4211146e5d3d62812865fd3c221825a43c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,6 +163,10 @@ tests:
     - bash -e ./tests/run_tests.sh NFSNodes "files/inventory.$STACKNAME" "../gc_key.pem"
     - bash -e ./tests/run_tests.sh SQLNodes "files/inventory.$STACKNAME" "../gc_key.pem"
     
+    - sudo `which sacctmgr` add account pXXX cluster=m3 Description="Test parent account" Organization="Monash"
+    - sudo `which sacctmgr` add account ab12 parent=pXXX cluster=m3 Organization="Monash"
+    - sudo `which sacctmgr` create user slurmtest cluster=m3 account=ab12
+    - srun --ntasks=2  --partition=batch  hostname
     # licensing https://gitlab.erc.monash.edu.au/hpc-team/license_server/tree/master/roles/avizo_license_monitor
 
 manual_cluster_spawn:
diff --git a/roles/calculateSlurmConf/templates/slurm.conf.j2 b/roles/calculateSlurmConf/templates/slurm.conf.j2
index dc833e3e78c8fa191c434c0795c0f936cfbb1e7c..d460ef811ddb8f3474b26a5e3ff72bf7434a718b 100644
--- a/roles/calculateSlurmConf/templates/slurm.conf.j2
+++ b/roles/calculateSlurmConf/templates/slurm.conf.j2
@@ -119,8 +119,8 @@ JobCompType=jobcomp/none
 Prolog={{ slurmjob.prolog }}
 Epilog={{ slurmjob.epilog }}
 {% else %}
-Prolog={{ slurm_dir }}/bin/slurm.prolog
-Epilog={{ slurm_dir }}/bin/slurm.epilog
+Prolog=/opt/slurm/etc/slurm.prolog
+Epilog=/opt/slurm/etc/slurm.epilog
 {% endif %}
 #
 # ACCOUNTING