diff --git a/src/test/java/org/gaul/s3proxy/AwsSdkTest.java b/src/test/java/org/gaul/s3proxy/AwsSdkTest.java
index 6bbd69a..a754dd5 100644
--- a/src/test/java/org/gaul/s3proxy/AwsSdkTest.java
+++ b/src/test/java/org/gaul/s3proxy/AwsSdkTest.java
@@ -128,7 +128,7 @@ public final class AwsSdkTest {
     @Before
     public void setUp() throws Exception {
         TestUtils.S3ProxyLaunchInfo info = TestUtils.startS3Proxy(
-                "s3proxy.conf");
+                System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
         awsCreds = new BasicAWSCredentials(info.getS3Identity(),
                 info.getS3Credential());
         context = info.getBlobStore().getContext();
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
index 376f79c..c8a7191 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
@@ -63,7 +63,8 @@ public final class JcloudsBucketsLiveTest extends BucketsLiveTest {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
index bc66827..933a86b 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
@@ -59,7 +59,8 @@ public final class JcloudsS3BlobIntegrationLiveTest
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
index 6f333b3..49e0716 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
@@ -55,7 +55,8 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
         } catch (Exception e) {
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
index 85b8ab7..334edd3 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
@@ -67,7 +67,8 @@ public final class JcloudsS3ClientLiveTest extends S3ClientLiveTest {
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
index a19168c..13b386c 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
@@ -58,7 +58,8 @@ public final class JcloudsS3ContainerIntegrationLiveTest
     protected Properties setupProperties() {
         TestUtils.S3ProxyLaunchInfo info;
         try {
-            info = TestUtils.startS3Proxy("s3proxy.conf");
+            info = TestUtils.startS3Proxy(
+                    System.getProperty("s3proxy.test.conf", "s3proxy.conf"));
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
             blobStoreType = context.unwrap().getProviderMetadata().getId();