diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/provider/GenericAcmeProvider.java b/acme4j-client/src/main/java/org/shredzone/acme4j/provider/GenericAcmeProvider.java
index 39e4fb50..2609e639 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/provider/GenericAcmeProvider.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/provider/GenericAcmeProvider.java
@@ -34,7 +34,7 @@ public class GenericAcmeProvider extends AbstractAcmeProvider {
     @Override
     public URL resolve(URI serverUri) {
         try {
-            return new URL(serverUri.getScheme(), serverUri.getHost(), serverUri.getPort(), serverUri.getPath());
+            return serverUri.toURL();
         } catch (MalformedURLException ex) {
             throw new IllegalArgumentException("Bad generic server URI", ex);
         }
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/GenericAcmeProviderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/GenericAcmeProviderTest.java
index 6bdb9cf9..d60d8c32 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/provider/GenericAcmeProviderTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/provider/GenericAcmeProviderTest.java
@@ -44,7 +44,7 @@ public class GenericAcmeProviderTest {
      */
     @Test
     public void testResolve() throws URISyntaxException {
-        var serverUri = new URI("http://example.com/acme");
+        var serverUri = new URI("http://example.com/acme?foo=abc&bar=123");
 
         var provider = new GenericAcmeProvider();