diff --git a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties
index 9e2df1b3..bfd4b0d4 100644
--- a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties
+++ b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldap.properties
@@ -4,5 +4,5 @@ password=secret
 base=dc=jayway,dc=se
 
 aws.ami=ami-56ec083f
-aws.key=spring-ldap-keypair
+aws.keypair=spring-ldap-keypair
 aws.security.group=spring-ldap
\ No newline at end of file
diff --git a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml
index 747f8d60..ebe7a3aa 100644
--- a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml
+++ b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext-tls.xml
@@ -15,7 +15,7 @@
 		<property name="awsSecretKey" value="${aws.secret.key}" />
 		<property name="imageName" value="${aws.ami}" />
 		<property name="groupName" value="${aws.security.group}" />
-		<property name="keyName" value="${aws.key}" />
+		<property name="keyName" value="${aws.keypair}" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
diff --git a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
index cca75e41..7ea93876 100644
--- a/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
+++ b/mvn-build/test/integration-tests-openldap/src/test/resources/conf/ldapTemplateTestContext.xml
@@ -12,9 +12,9 @@
 	<bean id="contextSource" class="org.springframework.ldap.ContextSourceEc2InstanceLaunchingFactoryBean">
 		<property name="awsKey" value="${aws.key}" />
 		<property name="awsSecretKey" value="${aws.secret.key}" />
-		<property name="imageName" value="ami-56ec083f" />
-		<property name="groupName" value="spring-ldap" />
-		<property name="keyName" value="spring-ldap-keypair" />
+		<property name="imageName" value="${aws.ami}" />
+		<property name="groupName" value="${aws.security.group}" />
+		<property name="keyName" value="${aws.keypair}" />
 		<property name="base" value="dc=jayway,dc=se" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />