diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties
index 18dec59a4d..071d091d41 100644
--- a/core/src/main/resources/rest.properties
+++ b/core/src/main/resources/rest.properties
@@ -175,7 +175,7 @@ walrus.contextbuilder=org.jclouds.s3.S3ContextBuilder
 walrus.propertiesbuilder=org.jclouds.walrus.WalrusPropertiesBuilder
 
 eucalyptus-partnercloud-s3.contextbuilder=org.jclouds.s3.S3ContextBuilder
-eucalyptus-partnercloud-s3.propertiesbuilder=org.jclouds.ecc.EucalyptusPartnerCloudWalrusPropertiesBuilder
+eucalyptus-partnercloud-s3.propertiesbuilder=org.jclouds.epc.EucalyptusPartnerCloudWalrusPropertiesBuilder
 
 googlestorage.contextbuilder=org.jclouds.s3.S3ContextBuilder
 googlestorage.propertiesbuilder=org.jclouds.googlestorage.GoogleStoragePropertiesBuilder
diff --git a/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java
index be3ba7f266..657812490f 100644
--- a/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java
+++ b/providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/epc/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java
@@ -51,7 +51,7 @@ public class EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest extends Bas
          public boolean apply(OsFamilyVersion64Bit input) {
             return input.family == OsFamily.RHEL || //
                      (input.family == OsFamily.CENTOS && !input.version.equals("5.3") || !input.is64Bit) || //
-                     input.family == OsFamily.WINDOWS || //
+                     (input.family == OsFamily.WINDOWS && !(input.version.equals("2008") && input.is64Bit)) || //
                      input.family == OsFamily.UBUNTU;
 
          }
diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java
index 83b90ae564..c93c7a811a 100644
--- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java
+++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java
@@ -29,8 +29,8 @@ import org.testng.annotations.Test;
 public class EucalyptusPartnerCloudWalrusAsyncClientTestDisabled extends org.jclouds.walrus.WalrusAsyncClientTestDisabled {
 
    public EucalyptusPartnerCloudWalrusAsyncClientTestDisabled() {
-      this.provider = "ecc";
-      this.url = "commondatastorage.googleapis.com";
+      this.provider = "eucalyptus-partnercloud-s3";
+      this.url = "https://partnercloud.eucalyptus.com:8773/services/Walrus";
    }
 
    // TODO parameterize this test so that it can pass
diff --git a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java
index e8cb39e441..c980b81344 100644
--- a/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java
+++ b/providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/epc/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java
@@ -37,7 +37,7 @@ import com.google.inject.Module;
 public class EucalyptusPartnerCloudWalrusTestInitializer extends TransientBlobStoreTestInitializer {
 
    public EucalyptusPartnerCloudWalrusTestInitializer() {
-      provider = "ecc-s3";
+      provider = "eucalyptus-partnercloud-s3";
       BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
    }