diff --git a/Makefile.am b/Makefile.am
index 8836a8d..59a5a02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,6 +128,7 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/0386_preventallow_2_it_nexuses.c \
 	test-tool/0390_mandatory_opcodes_sbc.c \
 	test-tool/0400_inquiry_basic.c \
+	test-tool/0401_inquiry_alloclen.c \
 	\
 	test-tool/1000_cmdsn_invalid.c \
 	test-tool/1010_datasn_invalid.c \
diff --git a/test-tool/0401_inquiry_alloclen.c b/test-tool/0401_inquiry_alloclen.c
new file mode 100644
index 0000000..b1011e9
--- /dev/null
+++ b/test-tool/0401_inquiry_alloclen.c
@@ -0,0 +1,80 @@
+/* 
+   Copyright (C) 2012 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-test.h"
+
+int T0401_inquiry_alloclen(const char *initiator, const char *url, int data_loss, int show_info)
+{ 
+	struct iscsi_context *iscsi;
+	struct scsi_task *task;
+	struct scsi_inquiry_standard *inq;
+	int ret, lun, i;
+	int full_size;
+
+	printf("0401_inquiry_alloclen:\n");
+	printf("===================\n");
+	if (show_info) {
+		printf("Test INQUIRY with alloclen 0-255.\n");
+		printf("1, Test standard inquiry with alloclen 0-255 is successful\n");
+		printf("\n");
+		return 0;
+	}
+
+	iscsi = iscsi_context_login(initiator, url, &lun);
+	if (iscsi == NULL) {
+		printf("Failed to login to target\n");
+		return -1;
+	}
+
+
+	ret = 0;
+
+
+
+	printf("Test INQUIRY with alloclen 0-255 ... ");
+	for (i = 1; i < 256; i++) {
+		task = iscsi_inquiry_sync(iscsi, lun, 0, 0, i);
+		if (task == NULL) {
+			printf("[FAILED]\n");
+			printf("Failed to send INQUIRY command : %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test2;
+		}
+		if (task->status != SCSI_STATUS_GOOD) {
+			printf("[FAILED]\n");
+			printf("INQUIRY command with alloclen:%d failed : %s\n", i, iscsi_get_error(iscsi));
+			scsi_free_scsi_task(task);
+			ret = -1;
+			goto test2;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+test2:
+
+
+finished:
+	iscsi_logout_sync(iscsi);
+	iscsi_destroy_context(iscsi);
+	return ret;
+}
diff --git a/test-tool/iscsi-test.c b/test-tool/iscsi-test.c
index 6108256..29fa4c7 100644
--- a/test-tool/iscsi-test.c
+++ b/test-tool/iscsi-test.c
@@ -203,6 +203,7 @@ struct scsi_test tests[] = {
 
 /* inquiry*/
 { "T0400_inquiry_basic",		T0400_inquiry_basic },
+{ "T0401_inquiry_alloclen",		T0401_inquiry_alloclen },
 
 /* iSCSI protocol tests */
 
diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h
index 83ad14e..007b8f3 100644
--- a/test-tool/iscsi-test.h
+++ b/test-tool/iscsi-test.h
@@ -157,6 +157,7 @@ int T0386_preventallow_2_itl_nexuses(const char *initiator, const char *url, int
 int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data_loss, int show_info);
 
 int T0400_inquiry_basic(const char *initiator, const char *url, int data_loss, int show_info);
+int T0401_inquiry_alloclen(const char *initiator, const char *url, int data_loss, int show_info);
 
 int T1000_cmdsn_invalid(const char *initiator, const char *url, int data_loss, int show_info);
 int T1010_datasn_invalid(const char *initiator, const char *url, int data_loss, int show_info);