diff --git a/Makefile.am b/Makefile.am
index 4162795..ec83693 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,6 +131,7 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/0400_inquiry_basic.c \
 	test-tool/0401_inquiry_alloclen.c \
 	test-tool/0402_inquiry_evpd.c \
+	test-tool/0403_inquiry_supported_vpd.c \
 	\
 	test-tool/1000_cmdsn_invalid.c \
 	test-tool/1010_datasn_invalid.c \
diff --git a/test-tool/0403_inquiry_supported_vpd.c b/test-tool/0403_inquiry_supported_vpd.c
new file mode 100644
index 0000000..36d02c8
--- /dev/null
+++ b/test-tool/0403_inquiry_supported_vpd.c
@@ -0,0 +1,124 @@
+/* 
+   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 T0403_inquiry_supported_vpd(const char *initiator, const char *url, int data_loss, int show_info)
+{ 
+	struct iscsi_context *iscsi;
+	struct scsi_task *task;
+	struct scsi_inquiry_supported_pages *inq;
+	int ret, lun, i, j;
+	int full_size;
+	int page_code;
+	enum scsi_inquiry_pagecode required_spc_pages[] = {
+		SCSI_INQUIRY_PAGECODE_SUPPORTED_VPD_PAGES,
+		SCSI_INQUIRY_PAGECODE_DEVICE_IDENTIFICATION
+	};
+
+	printf("0402_inquiry_supported_vpd:\n");
+	printf("==========================\n");
+	if (show_info) {
+		printf("Check the INQUIRY SUPPORTED VPD page.\n");
+		printf("1, Check we can read the SUPPORTED VPD page.\n");
+		printf("2, Verify we have all mandatory SPC VPD pages\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("Read SUPPORTED VPD data ... ");
+	/* See how big this inquiry data is */
+	page_code = SCSI_INQUIRY_PAGECODE_SUPPORTED_VPD_PAGES;
+	task = iscsi_inquiry_sync(iscsi, lun, 1, page_code, 255);
+	if (task == NULL) {
+		printf("[FAILED]\n");
+		printf("Failed to send INQUIRY command : %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		goto finished;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("INQUIRY command failed : %s\n", iscsi_get_error(iscsi));
+		scsi_free_scsi_task(task);
+		ret = -1;
+		goto finished;
+	}
+	full_size = scsi_datain_getfullsize(task);
+	if (full_size > task->datain.size) {
+		scsi_free_scsi_task(task);
+
+		/* we need more data for the full list */
+		if ((task = iscsi_inquiry_sync(iscsi, lun, 1, page_code, full_size)) == NULL) {
+			printf("[FAILED]\n");
+			printf("Inquiry command failed : %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto finished;
+		}
+	}
+	inq = scsi_datain_unmarshall(task);
+	if (inq == NULL) {
+		printf("[FAILED]\n");
+		printf("failed to unmarshall inquiry datain blob\n");
+		scsi_free_scsi_task(task);
+		ret = -1;
+		goto finished;
+	}
+	printf("[OK]\n");
+
+test2:
+	printf("Verify we have all mandatory SPC VPD pages:\n");
+	for (i = 0; i < sizeof(required_spc_pages) / sizeof(enum scsi_inquiry_pagecode); i++) {
+		printf("Verify the target supports page 0x%02x ... ", required_spc_pages[i]);
+		for (j = 0; j < inq->num_pages; j++) {
+			if (required_spc_pages[i] == inq->pages[j]) {
+				break;
+			}
+		}
+		if (j == inq->num_pages) {
+			printf("[FAILED]\n");
+			printf("Target did not report page 0x%02x. This page is mandatory in SPC.\n", required_spc_pages[i]);
+			ret = -1;
+		} else {
+			printf("[OK]\n");
+		}
+	}
+
+
+test3:
+	scsi_free_scsi_task(task);
+
+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 a8b3720..5dd7e87 100644
--- a/test-tool/iscsi-test.c
+++ b/test-tool/iscsi-test.c
@@ -208,6 +208,7 @@ struct scsi_test tests[] = {
 { "T0400_inquiry_basic",		T0400_inquiry_basic },
 { "T0401_inquiry_alloclen",		T0401_inquiry_alloclen },
 { "T0402_inquiry_evpd",			T0402_inquiry_evpd },
+{ "T0403_inquiry_supported_vpd",	T0403_inquiry_supported_vpd },
 
 /* iSCSI protocol tests */
 
diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h
index 756567c..deecefd 100644
--- a/test-tool/iscsi-test.h
+++ b/test-tool/iscsi-test.h
@@ -161,6 +161,7 @@ int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data
 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 T0402_inquiry_evpd(const char *initiator, const char *url, int data_loss, int show_info);
+int T0403_inquiry_supported_vpd(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);