diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index e7d3df2ce74..c3c0ce6380f 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -191,7 +191,7 @@ static struct cli_state *connect_one(char *share, int snum)
 	}
 
 	status = cli_connect_nb(server_n, NULL, 0, 0x20, myname,
-				Undefined, flags, &c);
+				SMB_SIGNING_DEFAULT, flags, &c);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("Connection to %s failed. Error %s\n", server_n,
 			  nt_errstr(status)));
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index d06acbc7570..28124b52881 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -194,7 +194,7 @@ static struct cli_state *connect_one(char *share)
 
 	nt_status = cli_full_connection(&c, myname, server_n, NULL, 0, share, "?????", 
 					username, lp_workgroup(), password, 0,
-					Undefined);
+					SMB_SIGNING_DEFAULT);
 
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0, ("cli_full_connection failed with error %s\n", nt_errstr(nt_status)));
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index eaac0d8edcc..5f0699f6fa3 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -179,8 +179,8 @@ static struct cli_state *connect_one(char *share)
 
 	server_n = server;
 
-	status = cli_connect_nb(server, NULL, 0, 0x20, "masktest", Undefined, 0,
-				&c);
+	status = cli_connect_nb(server, NULL, 0, 0x20, "masktest",
+				SMB_SIGNING_DEFAULT, 0, &c);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Connection to %s failed. Error %s\n", server_n,
 			 nt_errstr(status)));
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index cf2966c77cc..4a5f7908a31 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -64,7 +64,7 @@ static fstring multishare_conn_fname;
 static bool use_multishare_conn = False;
 static bool do_encrypt;
 static const char *local_path = NULL;
-static int signing_state = Undefined;
+static int signing_state = SMB_SIGNING_DEFAULT;
 char *test_filename;
 
 bool torture_showall = False;
@@ -1096,9 +1096,9 @@ static bool run_readwritelarge(int dummy)
 static bool run_readwritelarge_signtest(int dummy)
 {
 	bool ret;
-	signing_state = Required;
+	signing_state = SMB_SIGNING_REQUIRED;
 	ret = run_readwritelarge_internal();
-	signing_state = Undefined;
+	signing_state = SMB_SIGNING_DEFAULT;
 	return ret;
 }
 
@@ -6570,7 +6570,7 @@ static bool run_chain2(int dummy)
 
 	printf("starting chain2 test\n");
 	status = cli_start_connection(&cli1, lp_netbios_name(), host, NULL,
-				      port_to_use, Undefined, 0);
+				      port_to_use, SMB_SIGNING_DEFAULT, 0);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}