diff --git a/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanArgsParserTest.kt b/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanArgsParserTest.kt
index eb53a7ba48..3a287f4ae9 100644
--- a/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanArgsParserTest.kt
+++ b/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanArgsParserTest.kt
@@ -25,15 +25,16 @@ class DoormanArgsParserTest {
     @Test
     fun `should fail when network parameters file is missing`() {
         assertThatThrownBy {
-            argsParser.parseOrExit("--config-file", validConfigPath, "--set-network-parameters", "not-here")
+            argsParser.parseOrExit("--config-file", validConfigPath, "--set-network-parameters", "not-here",
+                    printHelpOn = null)
         }.hasMessageContaining("not-here")
     }
 
     @Test
     fun `should fail when config file is missing`() {
         assertThatThrownBy {
-            argsParser.parseOrExit("--config-file", "not-existing-file")
-        }.hasMessageContaining("not-existing-file")
+            argsParser.parseOrExit("--config-file", "not-existing-file", printHelpOn = null)
+        }.hasMessageContaining("Specified config file doesn't exist")
     }
 
     @Test
@@ -41,16 +42,16 @@ class DoormanArgsParserTest {
         val parameter = argsParser.parseOrExit("--config-file", validConfigPath, "--mode", "ROOT_KEYGEN", "--trust-store-password", "testPassword")
         assertEquals("testPassword", parameter.trustStorePassword)
 
-        assertFailsWith<OptionException> {
+        assertFailsWith<RuntimeException> {
             argsParser.parseOrExit("--trust-store-password", printHelpOn = null)
         }
 
         // Should fail if password is provided in mode other then root keygen.
         assertFailsWith<IllegalArgumentException> {
-            argsParser.parseOrExit("--config-file", validConfigPath, "--trust-store-password", "testPassword")
+            argsParser.parseOrExit("--config-file", validConfigPath, "--trust-store-password", "testPassword", printHelpOn = null)
         }
 
         // trust store password is optional.
-        assertNull(argsParser.parseOrExit("--config-file", validConfigPath).trustStorePassword)
+        assertNull(argsParser.parseOrExit("--config-file", validConfigPath, printHelpOn = null).trustStorePassword)
     }
 }
diff --git a/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/configuration/SigningServiceArgsParserTest.kt b/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/configuration/SigningServiceArgsParserTest.kt
index 0b1d40ec6c..d7304cf368 100644
--- a/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/configuration/SigningServiceArgsParserTest.kt
+++ b/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/configuration/SigningServiceArgsParserTest.kt
@@ -51,7 +51,7 @@ class SigningServiceArgsParserTest : TestBase() {
     @Test
     fun `should fail when config file is missing`() {
         assertThatThrownBy {
-            argsParser.parseOrExit("--config-file", "not-existing-file")
+            argsParser.parseOrExit("--config-file", "not-existing-file", printHelpOn = null)
         }.hasMessageContaining("not-existing-file")
     }
 }
diff --git a/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/generator/GeneratorParametersTest.kt b/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/generator/GeneratorParametersTest.kt
index 517ed44644..82cbc84e7b 100644
--- a/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/generator/GeneratorParametersTest.kt
+++ b/network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/generator/GeneratorParametersTest.kt
@@ -30,7 +30,7 @@ class GeneratorParametersTest {
     @Test
     fun `should fail when config file is missing`() {
         val message = assertFailsWith<OptionException> {
-            ConfigFilePathArgsParser().parseOrExit("--config-file", "not-existing-file")
+            ConfigFilePathArgsParser().parseOrExit("--config-file", "not-existing-file", printHelpOn = null)
         }.message
         Assertions.assertThat(message).contains("not-existing-file")
     }