diff --git a/source4/torture/smb2/mangle.c b/source4/torture/smb2/mangle.c
index bf140643de2..118aeb2d066 100644
--- a/source4/torture/smb2/mangle.c
+++ b/source4/torture/smb2/mangle.c
@@ -201,8 +201,8 @@ static char *gen_name(struct torture_context *tctx)
 }
 
 
-bool torture_smb2_mangle(struct torture_context *torture,
-			 struct smb2_tree *tree)
+static bool torture_smb2_mangle(struct torture_context *torture,
+				struct smb2_tree *tree)
 {
 	extern int torture_numops;
 	int i;
@@ -245,3 +245,14 @@ bool torture_smb2_mangle(struct torture_context *torture,
 
 	return (failures == 0);
 }
+
+struct torture_suite *torture_smb2_name_mangling_init(TALLOC_CTX *ctx)
+{
+	struct torture_suite *suite = NULL;
+
+	suite = torture_suite_create(ctx, "name-mangling");
+	suite->description = talloc_strdup(suite, "SMB2 name mangling tests");
+
+	torture_suite_add_1smb2_test(suite, "mangle", torture_smb2_mangle);
+	return suite;
+}
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 24da6504bd0..c595b108ce8 100644
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -210,9 +210,9 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
 	torture_suite_add_1smb2_test(suite, "sdread", torture_smb2_sdreadtest);
 	torture_suite_add_suite(suite, torture_smb2_readwrite_init(suite));
 	torture_suite_add_suite(suite, torture_smb2_max_allowed(suite));
-	torture_suite_add_1smb2_test(suite, "mangle", torture_smb2_mangle);
 	torture_suite_add_1smb2_test(suite, "tcon", run_tcon_test);
 	torture_suite_add_1smb2_test(suite, "mkdir", torture_smb2_mkdir);
+	torture_suite_add_suite(suite, torture_smb2_name_mangling_init(suite));
 
 	torture_suite_add_suite(suite, torture_smb2_charset(suite));
 	torture_suite_add_1smb2_test(suite, "secleak", torture_smb2_sec_leak);