3 files changed, 5 insertions, 3 deletions
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index 5d7dbaf93e..1488c17757 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -139,7 +139,7 @@ static void generate_release(struct nbt_name_socket *nbtsock, struct wins_state
 	istate->state = state;
 
 	io.in.name            = generate_name(tmp_ctx, idx);
-	io.in.dest_port       = lp_nbt_port(global_loadparm);
+	io.in.dest_port       = state->wins_port;
 	io.in.dest_addr       = state->wins_server;
 	io.in.address         = state->my_ip;
 	io.in.nb_flags        = NBT_NODE_H;
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 559c50df45..0065101447 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -195,6 +195,8 @@ static bool test_RFFPCNEx(struct torture_context *tctx,
 	const char *address;
 	struct interface *ifaces;
 
+	ntvfs_init(tctx->lp_ctx);
+
 	ZERO_STRUCT(q);
 
 	q.in.printername	= talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
@@ -291,7 +293,6 @@ struct torture_suite *torture_rpc_spoolss_notify(TALLOC_CTX *mem_ctx)
 	struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, 
 							"notify", &ndr_table_spoolss);
 
-	ntvfs_init(global_loadparm);
 	torture_rpc_tcase_add_test(tcase, "testRFFPCNEx", test_RFFPCNEx);
 	
 	return suite;
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index 8f70284ed3..1bc8aeb074 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -420,6 +420,8 @@ static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p)
 	char *server_name;
 	char *key_pointer;
 
+	ntvfs_init(tctx->lp_ctx);
+
 	ctx = talloc_zero(tctx, struct test_spoolss_win_context);
 	tmp_ctx = talloc_zero(tctx, struct test_spoolss_win_context);
 
@@ -570,7 +572,6 @@ struct torture_suite *torture_rpc_spoolss_win(TALLOC_CTX *mem_ctx)
 	struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, 
 							"win", &ndr_table_spoolss);
 
-	ntvfs_init(global_loadparm);
 	torture_rpc_tcase_add_test(tcase, "testWinXP", test_WinXP);
 
 	return suite;