diff --git a/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/impl/UrlResolverFactory.java b/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/impl/UrlResolverFactory.java
index eda8997d..00a85373 100644
--- a/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/impl/UrlResolverFactory.java
+++ b/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/impl/UrlResolverFactory.java
@@ -39,7 +39,7 @@ public UrlResolverFactory(final KpmProperties kpmProperties) {
     // add something like "/content/repositories" at this point.
     private String getValidUrlIfSonatype(final String url) {
         return url.contains("oss.sonatype.org") ?
-               String.format("%s/content/repositories/%s", kpmProperties.getNexusUrl(), kpmProperties.getNexusRepository()) :
+               String.format("%scontent/repositories/%s", kpmProperties.getNexusUrl(), kpmProperties.getNexusRepository()) :
                url;
     }
 
@@ -56,7 +56,7 @@ public UriResolver getVersionsProviderUrlResolver() {
         final AuthenticationMethod authMethod = AuthenticationMethod.valueOf(kpmProperties.getNexusAuthMethod().toUpperCase());
         switch (authMethod) {
             case NONE:
-                String baseUrl = getValidUrlIfSonatype(kpmProperties.getNexusUrl() + "/" + kpmProperties.getNexusRepository());
+                String baseUrl = getValidUrlIfSonatype(kpmProperties.getNexusUrl()  + kpmProperties.getNexusRepository());
                 return new NoneUriResolver(baseUrl);
 
             case BASIC:
diff --git a/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java b/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java
index 49ad0ef3..6051e29c 100644
--- a/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java
+++ b/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java
@@ -61,8 +61,8 @@ public void beforeMethod() {
     @Test(groups = "slow")
     public void testGetAvailablePlugins() {
         // Get plugin info from actual, default, killbill plugins_directory.yml. See DefaultPluginsDirectoryDAO
-        GetAvailablePluginsModel result = pluginManager.getAvailablePlugins("0.18.0", true);
-        Assert.assertEquals(result.getKillbillArtifactsVersion().getKillbill(), "0.18.0");
+        GetAvailablePluginsModel result = pluginManager.getAvailablePlugins("0.24.0", true);
+        Assert.assertEquals(result.getKillbillArtifactsVersion().getKillbill(), "0.24.0");
         Assert.assertFalse(result.getAvailablePlugins().isEmpty());
 
         try {