diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerOptionsBuilder.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerOptionsBuilder.groovy
index 594bec0681..903b21c789 100644
--- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerOptionsBuilder.groovy
+++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerOptionsBuilder.groovy
@@ -5,7 +5,7 @@ import io.codearte.accurest.stubrunner.util.StubsParser
 
 @CompileStatic
 class StubRunnerOptionsBuilder {
-	private static final String DELIMITER = ":";
+	private static final String DELIMITER = ':'
 	private LinkedList<String> stubs = new LinkedList<>()
 	private Map<StubConfiguration, Integer> stubIdsToPortMapping = [:]
 
@@ -13,7 +13,7 @@ class StubRunnerOptionsBuilder {
 	private Integer maxPortValue = 15000
 	private String stubRepositoryRoot
 	private boolean workOffline = false
-	private String stubsClassifier = "stubs"
+	private String stubsClassifier = 'stubs'
 
 	StubRunnerOptionsBuilder() {
 	}
@@ -29,7 +29,7 @@ class StubRunnerOptionsBuilder {
 
 	StubRunnerOptionsBuilder withStubs(List<String> stubs) {
 		for (String stub : stubs) {
-			withStubs(stub);
+			withStubs(stub)
 		}
 		return this
 	}
@@ -66,26 +66,27 @@ class StubRunnerOptionsBuilder {
 	}
 
 	StubRunnerOptionsBuilder withPort(Integer port) {
-		String lastStub = stubs.peekLast();
+		String lastStub = stubs.peekLast()
 		println "PORT  $lastStub -> $port"
-		addPort(lastStub + DELIMITER + port);
-		return this;
+		addPort(lastStub + DELIMITER + port)
+		return this
+	}
+
+	StubRunnerOptionsBuilder withOptions(StubRunnerOptions options) {
+		this.minPortValue = options.minPortValue
+		this.maxPortValue = options.maxPortValue
+		this.stubRepositoryRoot = options.stubRepositoryRoot
+		this.workOffline = options.workOffline
+		this.stubsClassifier = options.stubsClassifier
+		return this
 	}
 
 	StubRunnerOptions build() {
 		return new StubRunnerOptions(minPortValue, maxPortValue, stubRepositoryRoot, workOffline, stubsClassifier, buildDependencies(), stubIdsToPortMapping)
 	}
 
-	void withOptions(StubRunnerOptions options) {
-		this.minPortValue = options.minPortValue
-		this.maxPortValue = options.maxPortValue
-		this.stubRepositoryRoot = options.stubRepositoryRoot
-		this.workOffline = options.workOffline
-		this.stubsClassifier = options.stubsClassifier
-	}
-
 	private Collection<StubConfiguration> buildDependencies() {
-		return StubsParser.fromString(stubs, stubsClassifier);
+		return StubsParser.fromString(stubs, stubsClassifier)
 	}
 
 	private static List<String> stubsToList(String stubIdsToPortMapping) {
@@ -94,21 +95,21 @@ class StubRunnerOptionsBuilder {
 
 	private void addStub(List<String> notations) {
 		for (String notation : notations) {
-			addStub(notation);
+			addStub(notation)
 		}
 	}
 
 	private void addStub(String notation) {
 		if (StubsParser.hasPort(notation)) {
-			addPort(notation);
-			stubs.add(StubsParser.ivyFromStringWithPort(notation));
+			addPort(notation)
+			stubs.add(StubsParser.ivyFromStringWithPort(notation))
 		} else {
-			stubs.add(notation);
+			stubs.add(notation)
 		}
 	}
 
 	private void addPort(String notation) {
-		putStubIdsToPortMapping(StubsParser.fromStringWithPort(notation));
+		putStubIdsToPortMapping(StubsParser.fromStringWithPort(notation))
 	}
 
 	private void putStubIdsToPortMapping(Map<StubConfiguration, Integer> stubIdsToPortMapping) {
diff --git a/stub-runner/stub-runner/src/test/groovy/io/codearte/accurest/stubrunner/StubRunnerOptionsBuilderSpec.groovy b/stub-runner/stub-runner/src/test/groovy/io/codearte/accurest/stubrunner/StubRunnerOptionsBuilderSpec.groovy
new file mode 100644
index 0000000000..07de7cb30b
--- /dev/null
+++ b/stub-runner/stub-runner/src/test/groovy/io/codearte/accurest/stubrunner/StubRunnerOptionsBuilderSpec.groovy
@@ -0,0 +1,68 @@
+package io.codearte.accurest.stubrunner
+
+import spock.lang.Specification
+
+class StubRunnerOptionsBuilderSpec extends Specification {
+
+	private StubRunnerOptionsBuilder builder = new StubRunnerOptionsBuilder()
+
+	def shouldCreateDependenciesForStub() {
+
+		given:
+		builder.withStubs('foo:bar')
+
+		when:
+		StubRunnerOptions options = builder.build()
+
+		then:
+		options.getDependencies().toString() == '[foo:bar:+:stubs]'
+	}
+
+	def shouldCreateDependenciesForCommaSeparatedStubs() {
+
+		given:
+		builder.withStubs('foo:bar,bar:foo')
+
+		when:
+		StubRunnerOptions options = builder.build()
+
+		then:
+		options.getDependencies().size() == 2
+	}
+
+	def shouldMapStubsWithPort() {
+
+		given:
+		builder.withStubs('foo:bar:8080')
+
+		when:
+		StubRunnerOptions options = builder.build()
+
+		then:
+		options.getStubIdsToPortMapping().toString() == '[foo:bar:+:stubs:8080]'
+	}
+
+	def shouldCreateDependenciesWithVersion() {
+
+		given:
+		builder.withStubs('foo:1.2.3:bar')
+
+		when:
+		StubRunnerOptions options = builder.build()
+
+		then:
+		options.getDependencies().toString() == '[foo:1.2.3:bar:stubs]'
+	}
+
+	def shouldCreateDependenciesWithClassifier() {
+
+		given:
+		builder.withStubs('foo:bar').withStubsClassifier('xxx')
+
+		when:
+		StubRunnerOptions options = builder.build()
+
+		then:
+		options.getDependencies().toString() == '[foo:bar:+:xxx]'
+	}
+}