diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
index 58646914c..36f2f2bc7 100644
--- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
+++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
@@ -180,7 +180,7 @@ private SslContextFactory.Server createTestSslContextFactory(
 			String hostName, String ip) {
 		SslContextFactory.Server factory = new SslContextFactory.Server();
 
-		String dName = "CN=,OU=,O=,ST=,L=,C=";
+		String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA";
 
 		try {
 			File tmpDir = Files.createTempDirectory("jks").toFile();
@@ -196,8 +196,11 @@ private SslContextFactory.Server createTestSslContextFactory(
 							"-keystore", keyStore.getAbsolutePath(), //
 							"-storepass", keyPassword,
 							"-alias", hostName, //
+							"-ext", "bc=ca:true", //
 							"-ext",
-							String.format("san=IP:%s,DNS:%s", ip, hostName), //
+							String.format(
+									"san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s",
+									ip, hostName), //
 							"-genkeypair", //
 							"-keyalg", "RSA", //
 							"-keypass", keyPassword, //