diff --git a/pom.xml b/pom.xml
index 2556a94a19..d61f83f098 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,11 @@
 				<artifactId>mockito-core</artifactId>
 				<version>1.10.19</version>
 			</dependency>
+			<dependency>
+				<groupId>io.specto</groupId>
+				<artifactId>hoverfly-junit</artifactId>
+				<version>0.1.8</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-contract-dependencies</artifactId>
diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml
index 7e836a5d7c..baf3c86c5f 100644
--- a/spring-cloud-contract-stub-runner/pom.xml
+++ b/spring-cloud-contract-stub-runner/pom.xml
@@ -97,7 +97,6 @@
 		<dependency>
 			<groupId>io.specto</groupId>
 			<artifactId>hoverfly-junit</artifactId>
-			<version>0.1.8</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/tests/pom.xml b/tests/pom.xml
index 416a35d922..5bbd020ba0 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -27,6 +27,7 @@
 		<module>spring-cloud-contract-stub-runner-boot-zookeeper</module>
 		<module>spring-cloud-contract-stub-runner-camel</module>
 		<module>spring-cloud-contract-stub-runner-context-path</module>
+		<module>spring-cloud-contract-stub-runner-moco</module>
 		<module>spring-cloud-contract-stub-runner-integration</module>
 		<module>spring-cloud-contract-stub-runner-stream</module>
 		<module>spring-cloud-contract-stub-runner-amqp</module>
diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
new file mode 100644
index 0000000000..64cdd42817
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-contract-tests</artifactId>
+		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-contract-stub-runner-moco</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Cloud Contract Stub Runner Moco</name>
+	<description>Spring Cloud Contract Stub Runner Moco</description>
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.github.dreamhead</groupId>
+			<artifactId>moco-runner</artifactId>
+			<version>0.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-verifier</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spockframework</groupId>
+			<artifactId>spock-spring</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>info.solidsoft.spock</groupId>
+			<artifactId>spock-global-unroll</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.gmavenplus</groupId>
+				<artifactId>gmavenplus-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy b/tests/spring-cloud-contract-stub-runner-moco/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy
new file mode 100644
index 0000000000..2ea0a8f77f
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy
@@ -0,0 +1,64 @@
+package org.springframework.cloud.contract.stubrunner.provider.moco
+
+import com.github.dreamhead.moco.bootstrap.arg.HttpArgs
+import com.github.dreamhead.moco.runner.JsonRunner
+import org.springframework.cloud.contract.stubrunner.HttpServerStub
+import org.springframework.util.SocketUtils
+
+/**
+ * @author Marcin Grzejszczak
+ */
+class MocoHttpServerStub implements HttpServerStub {
+
+	private boolean started
+	private JsonRunner runner
+	private int port
+
+	@Override
+	int port() {
+		if (!isRunning()) {
+			return -1
+		}
+		return port
+	}
+
+	@Override
+	boolean isRunning() {
+		return started
+	}
+
+	@Override
+	HttpServerStub start() {
+		return start(SocketUtils.findAvailableTcpPort())
+	}
+
+	@Override
+	HttpServerStub start(int port) {
+		this.port = port
+		return this
+	}
+
+	@Override
+	HttpServerStub stop() {
+		if (!isRunning()) {
+			return this
+		}
+		this.runner.stop()
+		return this
+	}
+
+	@Override
+	HttpServerStub registerMappings(Collection<File> stubFiles) {
+		List<InputStream> streams = stubFiles.collect { it.newInputStream() }
+		this.runner = JsonRunner.newJsonRunnerWithStreams(streams,
+				HttpArgs.httpArgs().withPort(this.port).build())
+		this.runner.run()
+		this.started = true
+		return this
+	}
+
+	@Override
+	boolean isAccepted(File file) {
+		return file.name.endsWith(".json")
+	}
+}
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStubSpec.groovy b/tests/spring-cloud-contract-stub-runner-moco/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStubSpec.groovy
new file mode 100644
index 0000000000..951ac9a055
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStubSpec.groovy
@@ -0,0 +1,36 @@
+package org.springframework.cloud.contract.stubrunner.provider.moco
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration
+import org.springframework.boot.test.context.SpringBootContextLoader
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.cloud.contract.stubrunner.StubFinder
+import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner
+import org.springframework.context.annotation.Configuration
+import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.context.ContextConfiguration
+import spock.lang.Specification
+
+/**
+ * @author Marcin Grzejszczak
+ */
+@ContextConfiguration(classes = Config, loader = SpringBootContextLoader)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@AutoConfigureStubRunner( ids =
+		["org.springframework.cloud.contract.verifier.stubs:fraudDetectionServerMoco"],
+		repositoryRoot = "classpath:m2repo/repository/")
+@DirtiesContext
+class MocoHttpServerStubSpec extends Specification {
+
+	@Autowired StubFinder stubFinder
+
+	def 'should successfully receive a response from a stub'() {
+		expect:
+			"${stubFinder.findStubUrl('fraudDetectionServerMoco').toString()}/name".toURL().text == 'fraudDetectionServerMoco'
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	static class Config {
+	}
+}
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/resources/META-INF/spring.factories b/tests/spring-cloud-contract-stub-runner-moco/test/resources/META-INF/spring.factories
new file mode 100644
index 0000000000..a48f1e4078
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/test/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.cloud.contract.stubrunner.HttpServerStub=\
+org.springframework.cloud.contract.stubrunner.provider.moco.MocoHttpServerStub
\ No newline at end of file
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/resources/application.yml b/tests/spring-cloud-contract-stub-runner-moco/test/resources/application.yml
new file mode 100644
index 0000000000..9752093711
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/test/resources/application.yml
@@ -0,0 +1,5 @@
+stubrunner:
+  idsToServiceIds:
+    fraudDetectionServerMoco: someNameThatShouldMapFraudDetectionServer
+server:
+  port: 0
\ No newline at end of file
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/resources/logback.xml b/tests/spring-cloud-contract-stub-runner-moco/test/resources/logback.xml
new file mode 100644
index 0000000000..df6a2daa72
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/test/resources/logback.xml
@@ -0,0 +1,25 @@
+<!--
+  ~  Copyright 2013-2016 the original author or authors.
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<configuration>
+
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<logger name="org.springframework.cloud" level="DEBUG"/>
+
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+	</root>
+</configuration>
\ No newline at end of file
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/0.0.1-SNAPSHOT/fraudDetectionServerMoco-0.0.1-SNAPSHOT-stubs.jar b/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/0.0.1-SNAPSHOT/fraudDetectionServerMoco-0.0.1-SNAPSHOT-stubs.jar
new file mode 100644
index 0000000000..f2153d4cc9
Binary files /dev/null and b/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/0.0.1-SNAPSHOT/fraudDetectionServerMoco-0.0.1-SNAPSHOT-stubs.jar differ
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/0.0.1-SNAPSHOT/fraudDetectionServerMoco-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/0.0.1-SNAPSHOT/fraudDetectionServerMoco-0.0.1-SNAPSHOT.pom
new file mode 100644
index 0000000000..4ac46b5839
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/0.0.1-SNAPSHOT/fraudDetectionServerMoco-0.0.1-SNAPSHOT.pom
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  Copyright 2013-2016 the original author or authors.
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>
+  <artifactId>fraudDetectionServerMoco</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+</project>
diff --git a/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/maven-metadata.xml b/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/maven-metadata.xml
new file mode 100644
index 0000000000..84801f46e2
--- /dev/null
+++ b/tests/spring-cloud-contract-stub-runner-moco/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServerMoco/maven-metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  Copyright 2013-2016 the original author or authors.
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<metadata>
+  <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>
+  <artifactId>fraudDetectionServerMoco</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <versioning>
+    <versions>
+      <version>0.0.1-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20160409062112</lastUpdated>
+  </versioning>
+</metadata>