diff --git a/source/torture/raw/eas.c b/source/torture/raw/eas.c
index cbe89926daf..1fec54b38ae 100644
--- a/source/torture/raw/eas.c
+++ b/source/torture/raw/eas.c
@@ -35,7 +35,7 @@
 		goto done; \
 	}} while (0)
 
-static	BOOL maxeadebug = 0; /* need that here, to allow no file delete in debug case */
+static	BOOL maxeadebug; /* need that here, to allow no file delete in debug case */
 
 static BOOL check_ea(struct smbcli_state *cli, 
 		     const char *fname, const char *eaname, const char *value)
@@ -460,10 +460,37 @@ BOOL torture_raw_eas(void)
 		return False;
 	}
 
-	ret &= test_max_eas(cli, mem_ctx);
 	ret &= test_eas(cli, mem_ctx);
 	ret &= test_nttrans_create(cli, mem_ctx);
 
+	smb_raw_exit(cli->session);
+
+	torture_close_connection(cli);
+	talloc_free(mem_ctx);
+	return ret;
+}
+
+/* 
+   test max EA size
+*/
+BOOL torture_max_eas(void)
+{
+	struct smbcli_state *cli;
+	BOOL ret = True;
+	TALLOC_CTX *mem_ctx;
+
+	if (!torture_open_connection(&cli)) {
+		return False;
+	}
+
+	mem_ctx = talloc_init("torture_raw_eas");
+
+	if (!torture_setup_dir(cli, BASEDIR)) {
+		return False;
+	}
+
+	ret &= test_max_eas(cli, mem_ctx);
+
 	smb_raw_exit(cli->session);
 	if (!maxeadebug) {
 		/* in no ea debug case, all files are gone now */
diff --git a/source/torture/torture.c b/source/torture/torture.c
index 2cb9a22bcb7..5fe8a9865d8 100644
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -2264,6 +2264,7 @@ static struct {
 	{"RAW-RENAME", torture_raw_rename, 0},
 	{"RAW-SEEK", torture_raw_seek, 0},
 	{"RAW-EAS", torture_raw_eas, 0},
+	{"RAW-EAMAX", torture_max_eas, 0},
 	{"RAW-STREAMS", torture_raw_streams, 0},
 	{"RAW-ACLS", torture_raw_acls, 0},
 	{"RAW-RAP", torture_raw_rap, 0},