diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index d7a41c7..d5af80a 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -33,6 +33,7 @@ iscsi_test_cu_SOURCES = iscsi-test-cu.c \
 	test_mandatory_sbc.c \
 	test_modesense6_all_pages.c \
 	test_modesense6_control.c \
+	test_modesense6_control_swp.c \
 	test_modesense6_residuals.c \
 	test_nomedia_sbc.c \
 	test_orwrite_simple.c \
diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c
index fad8bca..1ecab72 100644
--- a/test-tool/iscsi-test-cu.c
+++ b/test-tool/iscsi-test-cu.c
@@ -101,6 +101,7 @@ static CU_TestInfo tests_mandatory[] = {
 static CU_TestInfo tests_modesense6[] = {
 	{ (char *)"AllPages", test_modesense6_all_pages },
 	{ (char *)"Control", test_modesense6_control },
+	{ (char *)"Control-SWP", test_modesense6_control_swp },
 	{ (char *)"Residuals", test_modesense6_residuals },
 	CU_TEST_INFO_NULL
 };
diff --git a/test-tool/iscsi-test-cu.h b/test-tool/iscsi-test-cu.h
index 512e022..7f8dd88 100644
--- a/test-tool/iscsi-test-cu.h
+++ b/test-tool/iscsi-test-cu.h
@@ -73,6 +73,7 @@ void test_mandatory_sbc(void);
 
 void test_modesense6_all_pages(void);
 void test_modesense6_control(void);
+void test_modesense6_control_swp(void);
 void test_modesense6_residuals(void);
 
 void test_nomedia_sbc(void);
diff --git a/test-tool/test_modesense6_control.c b/test-tool/test_modesense6_control.c
index 8964e86..57cec10 100644
--- a/test-tool/test_modesense6_control.c
+++ b/test-tool/test_modesense6_control.c
@@ -110,9 +110,8 @@ test_modesense6_control(void)
 		}
 	}
 	if(ct_page == NULL) {
-		logging(LOG_NORMAL, "[WARNING] CONTROL page was not returned "
-			"from AllPages. All devices SHOULD implement this "
-			"page.");
+		logging(LOG_NORMAL, "[WARNING] CONTROL page was not returned."
+			"All devices SHOULD implement this page.");
 	}
 
 	if (ap_page == NULL && ct_page != NULL) {
diff --git a/test-tool/test_modesense6_control_swp.c b/test-tool/test_modesense6_control_swp.c
new file mode 100644
index 0000000..3912452
--- /dev/null
+++ b/test-tool/test_modesense6_control_swp.c
@@ -0,0 +1,111 @@
+/* 
+   Copyright (C) 2015 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 <stdlib.h>
+
+#include <CUnit/CUnit.h>
+
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-support.h"
+#include "iscsi-test-cu.h"
+
+void
+test_modesense6_control_swp(void)
+{
+	struct scsi_task *ms_task = NULL;
+	struct scsi_mode_sense *ms;
+	struct scsi_mode_page *page;
+	unsigned char *buf = alloca(block_size);
+	int ret;
+
+	CHECK_FOR_DATALOSS;
+	CHECK_FOR_SBC;
+
+	logging(LOG_VERBOSE, LOG_BLANK_LINE);
+	logging(LOG_VERBOSE, "Test of MODESENSE6 CONTROL SWP flag");
+
+
+	logging(LOG_VERBOSE, "Set SWP to enable write protect");
+	ret = set_swp(sd);
+	CU_ASSERT_EQUAL(ret, 0);
+	if (ret) {
+		goto finished;
+	}
+
+	logging(LOG_VERBOSE, "Read the CONTROL page back from the device");
+	ret = modesense6(sd, &ms_task, 0, SCSI_MODESENSE_PC_CURRENT,
+			 SCSI_MODEPAGE_CONTROL, 0, 255,
+			 EXPECT_STATUS_GOOD);
+	CU_ASSERT_EQUAL(ret, 0);
+	logging(LOG_VERBOSE, "[SUCCESS] CONTROL page fetched.");
+
+	logging(LOG_VERBOSE, "Try to unmarshall the DATA-IN buffer.");
+	ms = scsi_datain_unmarshall(ms_task);
+	if (ms == NULL) {
+		logging(LOG_NORMAL, "[FAILED] failed to unmarshall mode sense "
+			"datain buffer");
+		CU_FAIL("[FAILED] Failed to unmarshall the data-in buffer.");
+		goto finished;
+	}
+	logging(LOG_VERBOSE, "[SUCCESS] Unmarshalling successful.");
+	for (page = ms->pages; page; page = page->next) {
+		if (page->page_code == SCSI_MODEPAGE_CONTROL) {
+			break;
+		}
+	}
+	if(page == NULL) {
+		logging(LOG_NORMAL, "[WARNING] CONTROL page was not returned."
+			"All devices SHOULD implement this page.");
+	}
+
+	logging(LOG_VERBOSE, "Verify that the SWP bit is set");
+	if (page->control.swp == 0) {
+		logging(LOG_NORMAL, "[FAILED] SWP bit is not set");
+		CU_FAIL("[FAILED] SWP is not set");
+		goto finished;
+	}
+	logging(LOG_VERBOSE, "[SUCCESS] SWP was set successfully");
+
+
+	logging(LOG_VERBOSE, "Read a block from the now Read-Only device");
+	ret = read10(sd, NULL, 0, block_size,
+		     block_size, 0, 0, 0, 0, 0, buf,
+		     EXPECT_STATUS_GOOD);
+	CU_ASSERT_EQUAL(ret, 0);
+
+	logging(LOG_VERBOSE, "Try to write a block to the Read-Only device");
+	ret = write10(sd, 0, block_size,
+		      block_size, 0, 0, 0, 0, 0, buf,
+		      EXPECT_WRITE_PROTECTED);
+	CU_ASSERT_EQUAL(ret, 0);
+
+	//	ret = set_swp(&sd2);
+	//	CU_ASSERT_EQUAL(ret, 0);
+	//if (ret != 0) {
+	//	return;
+	//}
+
+
+ finished:
+	if (ms_task != NULL) {
+		scsi_free_scsi_task(ms_task);
+	}
+	logging(LOG_VERBOSE, "Clear SWP to disable write protect");
+	clear_swp(sd);
+}