diff --git a/jetty-server/src/main/config/modules/test-keystore.mod b/jetty-server/src/main/config/modules/test-keystore.mod
index 40cf74e70da..42dd6a0a90c 100644
--- a/jetty-server/src/main/config/modules/test-keystore.mod
+++ b/jetty-server/src/main/config/modules/test-keystore.mod
@@ -9,7 +9,7 @@ ssl
 ssl
 
 [files]
-basehome:modules/test-keystore/keystore.p12|etc/test-keystore.p12
+basehome:modules/test-keystore/test-keystore.p12|etc/test-keystore.p12
 
 [ini]
 jetty.sslContext.keyStorePath?=etc/test-keystore.p12
diff --git a/jetty-server/src/main/config/modules/test-keystore/keystore.p12 b/jetty-server/src/main/config/modules/test-keystore/test-keystore.p12
similarity index 100%
rename from jetty-server/src/main/config/modules/test-keystore/keystore.p12
rename to jetty-server/src/main/config/modules/test-keystore/test-keystore.p12
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java
index f55a84dd5c9..2474e1ad945 100644
--- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java
+++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java
@@ -102,9 +102,8 @@ public class HttpInputIntegrationTest
         __server.addConnector(http);
 
         // SSL Context Factory for HTTPS and HTTP/2
-        String jettyDistro = System.getProperty("jetty.distro", "../../jetty-distribution/target/distribution");
         __sslContextFactory = new SslContextFactory.Server();
-        __sslContextFactory.setKeyStorePath(jettyDistro + "/../../../jetty-server/src/test/resources/keystore.p12");
+        __sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12");
         __sslContextFactory.setKeyStorePassword("storepwd");
 
         // HTTPS Configuration
diff --git a/tests/test-integration/src/test/resources/keystore.p12 b/tests/test-integration/src/test/resources/keystore.p12
new file mode 100644
index 00000000000..5c14fee0c85
Binary files /dev/null and b/tests/test-integration/src/test/resources/keystore.p12 differ