diff --git a/discovery/module_test.go b/discovery/module_test.go
index ef94407d5..4e781ef78 100644
--- a/discovery/module_test.go
+++ b/discovery/module_test.go
@@ -522,7 +522,7 @@ func TestModule_ActivateServiceForSubject(t *testing.T) {
 			subject := make([]credential.DiscoveryRegistrationCredentialSubject, 0)
 			_ = credentials[1].UnmarshalCredentialSubject(&subject)
 			assert.Equal(t, "value", subject[0]["test"])
-			assert.Equal(t, "https://example.com/oauth2/alice", subject[0]["authServerURL"])
+			assert.Equal(t, "https://nuts.nl/oauth2/alice", subject[0]["authServerURL"])
 			return &vpAlice, nil
 		})
 		testContext.subjectManager.EXPECT().ListDIDs(gomock.Any(), aliceSubject).Return([]did.DID{aliceDID}, nil)
diff --git a/policy/local.go b/policy/local.go
index e46edbd86..81719eb7d 100644
--- a/policy/local.go
+++ b/policy/local.go
@@ -61,6 +61,8 @@ func (b *LocalPDP) Configure(_ core.ServerConfig) error {
 				return fmt.Errorf("failed to load policy from directory: %w", err)
 			}
 		}
+	}
+	if b.config.Directory != "" {
 		if err := b.loadFromDirectory(b.config.Directory); err != nil {
 			return fmt.Errorf("failed to load policy from directory: %w", err)
 		}