diff --git a/Makefile.am b/Makefile.am
index 11d3eac..8a18646 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,7 +115,8 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/0383_preventallow_target_warm_reset.c \
 	test-tool/0384_preventallow_target_cold_reset.c \
 	test-tool/0385_preventallow_lun_reset.c \
-	test-tool/0386_preventallow_2_it_nexuses.c
+	test-tool/0386_preventallow_2_it_nexuses.c \
+	test-tool/0390_mandatory_opcodes_sbc.c
 
 endif
 
diff --git a/test-tool/0390_mandatory_opcodes_sbc.c b/test-tool/0390_mandatory_opcodes_sbc.c
new file mode 100644
index 0000000..81e6b80
--- /dev/null
+++ b/test-tool/0390_mandatory_opcodes_sbc.c
@@ -0,0 +1,396 @@
+/* 
+   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 "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-test.h"
+
+int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data_loss, int show_info)
+{ 
+	struct iscsi_context *iscsi;
+	struct scsi_task *task;
+	struct scsi_readcapacity16 *rc16;
+	struct scsi_inquiry_standard *inq;
+	int ret = 0, lun, sccs, encserv, lbpme;
+	unsigned char data[2048]; 
+	uint32_t block_size;
+	uint64_t num_blocks;
+	int full_size;
+
+	printf("0390_mandatory_opcodes_sbc:\n");
+	printf("===========================\n");
+	if (show_info) {
+		printf("Test support for all mandatory opcodes for SBC devices\n");
+		printf("1, Verify FORMAT UNIT is available\n");
+		printf("2, Verify INQUIRY is available\n");
+		printf("3, Verify MAINTENANCE IN is available (if SCCS bit is set)\n");
+		printf("4, Verify MAINTENANCE OUT is available (if SCCS bit is set)\n");
+		printf("5, Verify READ CAPACITY10 is available\n");
+		printf("6, Verify READ CAPACITY16 is available\n");
+		printf("7, Verify RECEIVE DIAGNOSTIC RESULT is available (if ENCSERV bit is set)\n");
+		printf("8, Verify REDUNDANCY GROUP IN is available (if SCCS bit is set)\n");
+		printf("9, Verify REDUNDANCY GROUP OUT is available (if SCCS bit is set)\n");
+		printf("10, Verify REPORT LUNS is available\n");
+		printf("11, Verify REQUEST SENSE is available\n");
+		printf("12, Verify SEND DIAGNOSTIC is available\n");
+		printf("13, Verify SPARE IN is available (if SCCS bit is set)\n");
+		printf("14, Verify SPARE OUT is available (if SCCS bit is set)\n");
+		printf("15, Verify TEST UNIT READY is available\n");
+		printf("16, Verify UNAMP is available (if LBPME bit is set)\n");
+		printf("17, Verify VOLUME SET IN is available (if SCCS bit is set)\n");
+		printf("18, Verify VOLUME SET OUT is available (if SCCS bit is set)\n");
+		printf("19, Verify WRITE SAME16 is available (if LBPME bit is set)\n");
+		printf("20, Verify WRITE SAME32 is available (if LBPME bit is set)\n");
+		printf("\n");
+		return 0;
+	}
+
+	iscsi = iscsi_context_login(initiator, url, &lun);
+	if (iscsi == NULL) {
+		printf("Failed to login to target\n");
+		return -1;
+	}
+
+	/* find the size of the LUN */
+	task = iscsi_readcapacity16_sync(iscsi, lun);
+	if (task == NULL) {
+		printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		goto finished;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	rc16 = scsi_datain_unmarshall(task);
+	if (rc16 == NULL) {
+		printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	block_size = rc16->block_length;
+	num_blocks = rc16->returned_lba;
+	lbpme      = rc16->lbpme;
+	scsi_free_scsi_task(task);
+
+	/* See how big this inquiry data is */
+	task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
+	if (task == NULL || task->status != SCSI_STATUS_GOOD) {
+		printf("Inquiry command failed : %s\n", iscsi_get_error(iscsi));
+		return -1;
+	}
+	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, 0, 0, full_size)) == NULL) {
+			printf("Inquiry command failed : %s\n", iscsi_get_error(iscsi));
+			return -1;
+		}
+	}
+	inq = scsi_datain_unmarshall(task);
+	if (inq == NULL) {
+		printf("failed to unmarshall inquiry datain blob\n");
+		scsi_free_scsi_task(task);
+		return -1;
+	}
+	sccs    = inq->sccs;
+	encserv = inq->encserv;
+	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+		printf("Not a SBC device. Skipping test\n");
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+
+	scsi_free_scsi_task(task);
+
+	if (!data_loss) {
+		printf("--dataloss flag is not set. Skipping test\n");
+		ret = -1;
+		goto finished;
+	}
+	
+
+
+	printf("Test FORMAT UNIT ... ");
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test2;
+
+
+test2:
+	printf("Test INQUIRY ... ");
+	task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send INQUIRY command: %s\n", iscsi_get_error(iscsi));
+		ret++;
+		goto test3;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("INQUIRY command: failed with sense %s\n", iscsi_get_error(iscsi));
+		ret++;
+		scsi_free_scsi_task(task);
+		goto test3;
+	}
+	scsi_free_scsi_task(task);
+
+	printf("[OK]\n");
+
+test3:
+	printf("Test MAINTENANCE IN ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test4;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test4;
+
+
+test4:
+	printf("Test MAINTENANCE OUT ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test5;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test5;
+
+test5:
+	printf("Test READ CAPACITY10 ... ");
+	task = iscsi_readcapacity10_sync(iscsi, lun,0 ,0);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send READ CAPACITY10 command: %s\n", iscsi_get_error(iscsi));
+		ret++;
+		goto test6;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("READ CAPACITY10 command: failed with sense %s\n", iscsi_get_error(iscsi));
+		ret++;
+		scsi_free_scsi_task(task);
+		goto test6;
+	}
+	scsi_free_scsi_task(task);
+
+	printf("[OK]\n");
+
+test6:
+	printf("Test READ CAPACITY16 ... ");
+	task = iscsi_readcapacity16_sync(iscsi, lun);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send READ CAPACITY16 command: %s\n", iscsi_get_error(iscsi));
+		ret++;
+		goto test7;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("READ CAPACITY16 command: failed with sense %s\n", iscsi_get_error(iscsi));
+		ret++;
+		scsi_free_scsi_task(task);
+		goto test7;
+	}
+	scsi_free_scsi_task(task);
+
+	printf("[OK]\n");
+
+test7:
+	printf("Test RECEIVE DIAGNOSTIC RESULT ... ");
+	if (encserv == 0) {
+		printf("[ENCSERV == 0, SKIPPING TEST]\n");
+		goto test8;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test8;
+
+
+test8:
+	printf("Test REDUNDANCY GROUP IN ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test9;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test9;
+
+
+test9:
+	printf("Test REDUNDANCY GROUP OUT ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test10;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test10;
+
+test10:
+	printf("Test REPORT LUNS ... ");
+	task = iscsi_reportluns_sync(iscsi, 0, 64);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send REPORT LUNS command: %s\n", iscsi_get_error(iscsi));
+		ret++;
+		goto test11;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("REPORT LUNS command: failed with sense %s\n", iscsi_get_error(iscsi));
+		ret++;
+		scsi_free_scsi_task(task);
+		goto test11;
+	}
+	scsi_free_scsi_task(task);
+
+	printf("[OK]\n");
+
+test11:
+	printf("Test REQUEST SENSE ... ");
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test12;
+
+test12:
+
+	printf("Test SEND DIAGNOSTIC ... ");
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test13;
+
+test13:
+	printf("Test SPARE IN ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test14;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test14;
+
+
+test14:
+	printf("Test SPARE OUT ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test15;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test15;
+
+test15:
+	printf("Test TEST UNIT READY ... ");
+	task = iscsi_testunitready_sync(iscsi, lun);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send TEST UNIT READY command: %s\n", iscsi_get_error(iscsi));
+		ret++;
+		goto test11;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("TEST UNIT READY command: failed with sense %s\n", iscsi_get_error(iscsi));
+		ret++;
+		scsi_free_scsi_task(task);
+		goto test16;
+	}
+	scsi_free_scsi_task(task);
+
+	printf("[OK]\n");
+
+test16:
+	printf("Test UNMAP ... ");
+	if (lbpme == 0) {
+		printf("[LBPME == 0, SKIPPING TEST]\n");
+		goto test17;
+	}
+	task = iscsi_unmap_sync(iscsi, lun, 0, 0, NULL, 0);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send UNMAP command: %s\n", iscsi_get_error(iscsi));
+		ret++;
+		goto test17;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("UNMAP command: failed with sense %s\n", iscsi_get_error(iscsi));
+		ret++;
+		scsi_free_scsi_task(task);
+		goto test17;
+	}
+	scsi_free_scsi_task(task);
+
+	printf("[OK]\n");
+
+test17:
+	printf("Test VOLUME SET IN ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test18;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test18;
+
+
+test18:
+	printf("Test VOLUME SET OUT ... ");
+	if (sccs == 0) {
+		printf("[SCCS == 0, SKIPPING TEST]\n");
+		goto test19;
+	}
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test19;
+
+test19:
+	printf("Test WRITE SAME16 ... ");
+	if (lbpme == 0) {
+		printf("[LBPME == 0, SKIPPING TEST]\n");
+		goto test20;
+	}
+	task = iscsi_writesame16_sync(iscsi, lun, data, block_size, 0, 1, 0, 1, 0, 0, 0, 0);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send WRITE SAME16 command: %s\n", iscsi_get_error(iscsi));
+		ret++;
+		goto test20;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("[FAILED]\n");
+		printf("WRITE SAME16 command: failed with sense %s\n", iscsi_get_error(iscsi));
+		ret++;
+		scsi_free_scsi_task(task);
+		goto test20;
+	}
+	scsi_free_scsi_task(task);
+
+	printf("[OK]\n");
+
+test20:
+	printf("Test WRITE SAME32 ... ");
+	printf("[TEST NOT IMPLEMENTED YET]\n");
+	goto test21;
+
+test21:
+
+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 faa1b86..3301502 100644
--- a/test-tool/iscsi-test.c
+++ b/test-tool/iscsi-test.c
@@ -183,6 +183,9 @@ struct scsi_test tests[] = {
 { "T0385_preventallow_lun_reset",	T0385_preventallow_lun_reset },
 { "T0386_preventallow_2_itl_nexuses",	T0386_preventallow_2_itl_nexuses },
 
+/* support for mandatory opcodes*/
+{ "T0390_mandatory_opcodes_sbc",	T0390_mandatory_opcodes_sbc },
+
 { NULL, NULL }
 };
 
diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h
index 76db0d1..ff34631 100644
--- a/test-tool/iscsi-test.h
+++ b/test-tool/iscsi-test.h
@@ -135,3 +135,5 @@ int T0383_preventallow_target_warm_reset(const char *initiator, const char *url,
 int T0384_preventallow_target_cold_reset(const char *initiator, const char *url, int data_loss, int show_info);
 int T0385_preventallow_lun_reset(const char *initiator, const char *url, int data_loss, int show_info);
 int T0386_preventallow_2_itl_nexuses(const char *initiator, const char *url, int data_loss, int show_info);
+
+int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data_loss, int show_info);