diff --git a/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/LookupClientTest.java b/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/LookupClientTest.java
index 57a94d61..52074674 100644
--- a/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/LookupClientTest.java
+++ b/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/LookupClientTest.java
@@ -116,7 +116,7 @@ public void simpleHeaderWithProvidedBusDoxDocIdQnsScheme() throws PeppolExceptio
 
         Endpoint endpoint = client.getEndpoint(
                 Header.newInstance()
-                        .receiver(ParticipantIdentifier.of("9915:helger"))
+                        .receiver(ParticipantIdentifier.of("0007:baswareapas4testendpoint"))
                         .documentType(DocumentTypeIdentifier.of(
                                 "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##" +
                                         "urn:cen.eu:en16931:2017#compliant#" +
@@ -135,7 +135,7 @@ public void simpleEndpoint() throws PeppolException {
                 .build();
 
         Endpoint endpoint = client.getEndpoint(
-                ParticipantIdentifier.of("9915:helger"),
+                ParticipantIdentifier.of("0007:baswareapas4testendpoint"),
                 DocumentTypeIdentifier.of(
                         "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##" +
                                 "urn:cen.eu:en16931:2017#compliant#" +
@@ -154,7 +154,7 @@ public void simpleEndpointWithProvidedBusDoxDocIdQnsScheme() throws PeppolExcept
                 .build();
 
         Endpoint endpoint = client.getEndpoint(
-                ParticipantIdentifier.of("9915:helger"),
+                ParticipantIdentifier.of("0007:baswareapas4testendpoint"),
                 DocumentTypeIdentifier.of(
                         "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##" +
                                 "urn:cen.eu:en16931:2017#compliant#" +
@@ -174,7 +174,7 @@ public void simpleEndpointWithHeaderAndProvidedBusDoxDocIdQnsScheme() throws Pep
 
         Header header = Header.newInstance()
                 .sender(ParticipantIdentifier.of("9908:invalid"))
-                .receiver(ParticipantIdentifier.of("9915:helger"))
+                .receiver(ParticipantIdentifier.of("0007:baswareapas4testendpoint"))
                 .process(ProcessIdentifier.of("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0"))
                 .documentType(DocumentTypeIdentifier.of(
                         "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##" +
diff --git a/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/locator/BdxlLocatorTest.java b/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/locator/BdxlLocatorTest.java
index a3f759f2..e0dbf3e1 100644
--- a/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/locator/BdxlLocatorTest.java
+++ b/peppol-lookup/src/test/java/network/oxalis/vefa/peppol/lookup/locator/BdxlLocatorTest.java
@@ -33,7 +33,7 @@ public class BdxlLocatorTest {
     public void simple() throws Exception {
         MetadataLocator locator = new BdxlLocator(Mode.of("TEST"));
         Assert.assertEquals(
-                locator.lookup(ParticipantIdentifier.of("9908:810418052")),
+                locator.lookup(ParticipantIdentifier.of("0192:810418052")),
                 URI.create("http://test-smp.difi.no/")
         );
     }