diff --git a/src/test/groovy/com/wooga/security/SecurityHelper.groovy b/src/test/groovy/com/wooga/security/SecurityHelper.groovy
index 2996e85..f6d86b4 100644
--- a/src/test/groovy/com/wooga/security/SecurityHelper.groovy
+++ b/src/test/groovy/com/wooga/security/SecurityHelper.groovy
@@ -253,15 +253,27 @@ class SecurityHelper {
                     '-passout', "pass:${password}", '-legacy'
         ]
         def sout = new StringBuilder(), serr = new StringBuilder()
+
+        //run with -legacy
         def proc = args.execute()
         proc.consumeProcessOutput(sout, serr)
         if (proc.waitFor() == 0) {
+            // if success, great, we have our result
+            return p12
+        }
+
+        //if -legacy fails, run without -legacy
+        args = args.remove('-legacy')
+        proc = args.execute()
+        proc.consumeProcessOutput(sout, serr)
+        if(proc.waitFor() == 0) {
+            //success without -legacy, we have our result
             return p12
-        } else {
-            println(sout)
-            println("====stderr====")
-            println(serr)
         }
+        //on error, print process output to help with debug
+        println(sout)
+        println("====stderr====")
+        println(serr)
         return null
     }