diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index c9cbba6030a1e7bc0a4f7cdad911e7374420307c..08c91d06afbacc6b43694d27c5832b6e8640bb07 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -22,6 +22,9 @@ idp_entityid = https://my.fqdn/simplesaml/saml2/idp/metadata.php
 # Name of the IdP
 idp_displayname = eduGAIN Access Check
 
+# IdP test accounts file
+idp_accounts_file = = @sysconfdir@/accounts.php
+
 # Root simpleSamlPhp directory
 root_ssp_dir = /opt/testidp/simplesamlphp
 
diff --git a/lib/IdPAccountManager/Tools.pm b/lib/IdPAccountManager/Tools.pm
index 7ceca5e922b4208ad50f8d4602cb5545dcd0976d..f18f6e489b5507ffc590867f8de9f4b2bc2fa0e6 100644
--- a/lib/IdPAccountManager/Tools.pm
+++ b/lib/IdPAccountManager/Tools.pm
@@ -82,7 +82,7 @@ sub generate_password {
 
 ## Updates simpleSamlPhp authsources.php configuration file
 sub update_ssp_authsources {
-    my ($templates_dir, $conf) = @_;
+    my ($templates_dir, $output) = @_;
 
     my $tt2 = Template->new({
         INCLUDE_PATH => $templates_dir
@@ -90,9 +90,7 @@ sub update_ssp_authsources {
     my $template = 'accountProfiles/valid-accounts.php.tt2';
     my $data = {
         accounts => IdPAccountManager::Data::TestAccount::Manager->get_testaccounts(),
-        conf     => $conf,
     };
-    my $output   = 'conf/valid-accounts.php';
 
     return $tt2->process($template, $data, $output);
 }
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index 0f704438531b074be453003ee08c75e4a1d224b2..67170f3c5cad27d81abffa5de99de26c4fc4c89f 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -487,7 +487,7 @@ sub req_validate_token {
     ## Update simpleSAMLphp configuration to enable test accounts
     unless (IdPAccountManager::Tools::update_ssp_authsources(
             $self->{configuration}->{templates_dir},
-            $self->{configuration}
+            $self->{configuration}->{idp_accounts_file}
         )) {
         push @{ $self->{out}->{errors} }, "accounts_creation_failed";
         $self->{logger}->error(