diff --git a/Makefile.am b/Makefile.am
index 907edb3..f2c8b81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -230,7 +230,6 @@ bin_iscsi_test_cu_SOURCES = test-tool/iscsi-test-cu.c \
 	test-tool/test_prout_reserve_ownership.c \
 	test-tool/test_read6_simple.c \
 	test-tool/test_read6_beyond_eol.c \
-	test-tool/test_read6_0blocks.c \
 	test-tool/test_read10_simple.c \
 	test-tool/test_read10_beyond_eol.c \
 	test-tool/test_read10_0blocks.c \
diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c
index dc1f362..f03ca03 100644
--- a/test-tool/iscsi-test-cu.c
+++ b/test-tool/iscsi-test-cu.c
@@ -173,7 +173,6 @@ static CU_TestInfo tests_prin_serviceaction_range[] = {
 static CU_TestInfo tests_read6[] = {
 	{ (char *)"Read6Simple", test_read6_simple },
 	{ (char *)"Read6BeyondEol", test_read6_beyond_eol },
-	{ (char *)"Read6ZeroBlocks", test_read6_0blocks },
 	CU_TEST_INFO_NULL
 };
 
diff --git a/test-tool/iscsi-test-cu.h b/test-tool/iscsi-test-cu.h
index 527e65f..893841f 100644
--- a/test-tool/iscsi-test-cu.h
+++ b/test-tool/iscsi-test-cu.h
@@ -104,7 +104,6 @@ void test_prout_reserve_ownership_wear(void);
 
 void test_read6_simple(void);
 void test_read6_beyond_eol(void);
-void test_read6_0blocks(void);
 void test_read6_rdprotect(void);
 void test_read6_flags(void);
 
diff --git a/test-tool/test_read6_0blocks.c b/test-tool/test_read6_0blocks.c
deleted file mode 100644
index 45999f5..0000000
--- a/test-tool/test_read6_0blocks.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* 
-   Copyright (C) 2013 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 <CUnit/CUnit.h>
-
-#include "iscsi.h"
-#include "scsi-lowlevel.h"
-#include "iscsi-test-cu.h"
-
-void
-test_read6_0blocks(void)
-{
-	int ret;
-
-	logging(LOG_VERBOSE, LOG_BLANK_LINE);
-	logging(LOG_VERBOSE, "Test READ6 0-blocks at LBA==0");
-	ret = read6(iscsic, tgt_lun, 0, 0, block_size, NULL);
-	if (ret == -2) {
-		logging(LOG_NORMAL, "[SKIPPED] READ6 is not implemented.");
-		CU_PASS("READ6 is not implemented.");
-		return;
-	}	
-	CU_ASSERT_EQUAL(ret, 0);
-
-	if (num_blocks > 0x1fffff) {
-		CU_PASS("[SKIPPED] LUN is too big");
-		return;
-	}
-
-	logging(LOG_VERBOSE, "Test READ6 0-blocks one block past end-of-LUN");
-	ret = read6_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1, 0,
-				  block_size, NULL);
-	CU_ASSERT_EQUAL(ret, 0);
-}