diff --git a/mockserver-tests/pom.xml b/mockserver-tests/pom.xml
index f09c8cd..ffc9d6c 100644
--- a/mockserver-tests/pom.xml
+++ b/mockserver-tests/pom.xml
@@ -44,6 +44,10 @@
             <artifactId>mockserver-client</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>info.solidsoft.spock</groupId>
+            <artifactId>spock-global-unroll</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy
index 0bef47f..28a070a 100644
--- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy
+++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy
@@ -16,7 +16,6 @@ import pl.touk.mockserver.client.Util
 import pl.touk.mockserver.server.HttpMockServer
 import spock.lang.Shared
 import spock.lang.Specification
-import spock.lang.Unroll
 
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLHandshakeException
@@ -24,9 +23,9 @@ import java.security.KeyStore
 
 class MockServerHttpsTest extends Specification {
 
-    RemoteMockServer remoteMockServer
+    RemoteMockServer remoteMockServer = new RemoteMockServer('localhost', 19000)
 
-    HttpMockServer httpMockServer
+    HttpMockServer httpMockServer = new HttpMockServer(19000)
 
     @Shared
     SSLContext noClientAuthSslContext = SSLContexts.custom()
@@ -45,17 +44,12 @@ class MockServerHttpsTest extends Specification {
         .loadTrustMaterial(trustStore())
         .build()
 
-    def setup() {
-        httpMockServer = new HttpMockServer(19000)
-        remoteMockServer = new RemoteMockServer('localhost', 19000)
-    }
-
     def cleanup() {
         httpMockServer.stop()
     }
 
     def 'should handle HTTPS server' () {
-        expect:
+        given:
             remoteMockServer.addMock(new AddMock(
                     name: 'testHttps',
                     path: 'testEndpoint',
@@ -79,7 +73,7 @@ class MockServerHttpsTest extends Specification {
     }
 
     def 'should handle HTTPS server with client auth' () {
-        expect:
+        given:
             remoteMockServer.addMock(new AddMock(
                 name: 'testHttps',
                 path: 'testEndpoint',
@@ -105,9 +99,8 @@ class MockServerHttpsTest extends Specification {
             restPostResponse.name() == 'goodResponse-request'
     }
 
-    @Unroll
     def 'should handle HTTPS server with wrong client auth' () {
-        expect:
+        given:
             remoteMockServer.addMock(new AddMock(
                 name: 'testHttps',
                 path: 'testEndpoint',
diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
index ab16248..05cd546 100644
--- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
+++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
@@ -29,7 +29,6 @@ import pl.touk.mockserver.client.Util
 import pl.touk.mockserver.server.HttpMockServer
 import spock.lang.Shared
 import spock.lang.Specification
-import spock.lang.Unroll
 
 class MockServerIntegrationTest extends Specification {
 
@@ -244,7 +243,6 @@ class MockServerIntegrationTest extends Specification {
             soapPostResponse.Body.'goodResponseSoap-request'.size() == 1
     }
 
-    @Unroll
     def "should dispatch rest mocks when second on #name"() {
         given:
             remoteMockServer.addMock(new AddMock(
@@ -283,7 +281,6 @@ class MockServerIntegrationTest extends Specification {
             9998       | 'test2'    | 'another port and path'
     }
 
-    @Unroll
     def "should dispatch rest mock with response code"() {
         given:
             remoteMockServer.addMock(new AddMock(
@@ -857,7 +854,6 @@ class MockServerIntegrationTest extends Specification {
             mockEvents2[0].response.statusCode == 202
     }
 
-    @Unroll
     def "should return mock report with #mockEvents events when deleting mock with flag skip mock = #skipReport"() {
         expect:
             remoteMockServer.addMock(new AddMock(
@@ -885,7 +881,6 @@ class MockServerIntegrationTest extends Specification {
             true       | 0
     }
 
-    @Unroll
     def "should reject mock when it has System.exit in closure"() {
         when:
             remoteMockServer.addMock(new AddMock(
@@ -1133,7 +1128,6 @@ class MockServerIntegrationTest extends Specification {
             remoteMockServer.removeMock('testRest')?.size() == 1
     }
 
-    @Unroll
     def 'should handle leading slash'() {
         given:
             String name = "testRest-${UUID.randomUUID().toString()}"
diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
index 859b712..58b7573 100644
--- a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
+++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
@@ -42,7 +42,7 @@ class HttpMockServer {
 
     HttpMockServer(int port = 9999, ConfigObject initialConfiguration = new ConfigObject(), int threads = 10) {
         executor = Executors.newFixedThreadPool(threads)
-        httpServerWrapper = new HttpServerWrapper(port, executor, null)
+        httpServerWrapper = new HttpServerWrapper(port, executor)
 
         initialConfiguration.values()?.each { ConfigObject co ->
             addMock(co)
diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy
index 0ab3ca2..a5e939c 100644
--- a/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy
+++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy
@@ -24,7 +24,7 @@ class HttpServerWrapper {
 
     private List<ContextExecutor> executors = []
 
-    HttpServerWrapper(int port, Executor executor, Https https) {
+    HttpServerWrapper(int port, Executor executor, Https https = null) {
         this.port = port
         InetSocketAddress addr = new InetSocketAddress(Inet4Address.getByName("0.0.0.0"), port)
         httpServer = buildServer(addr, https)
diff --git a/pom.xml b/pom.xml
index 43ce7cd..c99b3f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
         <jmh.version>1.11.2</jmh.version>
         <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
         <gmavenplus-plugin.version>1.4</gmavenplus-plugin.version>
+        <spock-global-unroll.version>0.5.1</spock-global-unroll.version>
     </properties>
 
     <scm>
@@ -99,6 +100,12 @@
                 <version>${jmh.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>info.solidsoft.spock</groupId>
+                <artifactId>spock-global-unroll</artifactId>
+                <version>${spock-global-unroll.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>