diff --git a/edison-aws/build.gradle b/edison-aws/build.gradle
index 21594a977..0cf42aad9 100644
--- a/edison-aws/build.gradle
+++ b/edison-aws/build.gradle
@@ -5,6 +5,7 @@ dependencies {
 
     compileOnly project(":edison-togglz")
     testCompile project(":edison-togglz")
+    testCompile project(":edison-testsupport")
 
     testCompile test_libraries.junit
     testCompile test_libraries.mockito_core
diff --git a/edison-aws/src/test/java/de/otto/edison/aws/s3/S3ServiceIntegrationTest.java b/edison-aws/src/test/java/de/otto/edison/aws/s3/S3ServiceIntegrationTest.java
index f69fdb822..fa9469232 100644
--- a/edison-aws/src/test/java/de/otto/edison/aws/s3/S3ServiceIntegrationTest.java
+++ b/edison-aws/src/test/java/de/otto/edison/aws/s3/S3ServiceIntegrationTest.java
@@ -1,6 +1,7 @@
 package de.otto.edison.aws.s3;
 
 import de.otto.edison.aws.configuration.AwsConfiguration;
+import de.otto.edison.testsupport.aws.AwsTestconfiguration;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/edison-testsupport/build.gradle b/edison-testsupport/build.gradle
index c670b5c44..70eb5304c 100644
--- a/edison-testsupport/build.gradle
+++ b/edison-testsupport/build.gradle
@@ -4,6 +4,8 @@ dependencies {
     compileOnly libraries.togglz_spring_boot_starter
     compileOnly test_libraries.togglz_testing
 
+    compile libraries.aws_sdk_ssm
+    compile libraries.aws_sdk_s3
     compile libraries.spring_boot
     compile libraries.spring_boot_autoconfigure
     compile test_libraries.junit
diff --git a/edison-aws/src/test/java/de/otto/edison/aws/s3/AwsTestconfiguration.java b/edison-testsupport/src/main/java/de/otto/edison/testsupport/aws/AwsTestconfiguration.java
similarity index 95%
rename from edison-aws/src/test/java/de/otto/edison/aws/s3/AwsTestconfiguration.java
rename to edison-testsupport/src/main/java/de/otto/edison/testsupport/aws/AwsTestconfiguration.java
index 8aa07b3a9..035880d95 100644
--- a/edison-aws/src/test/java/de/otto/edison/aws/s3/AwsTestconfiguration.java
+++ b/edison-testsupport/src/main/java/de/otto/edison/testsupport/aws/AwsTestconfiguration.java
@@ -1,4 +1,4 @@
-package de.otto.edison.aws.s3;
+package de.otto.edison.testsupport.aws;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;