diff --git a/tests/Makefile.am b/tests/Makefile.am
index 888968d4e9..7689453dde 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -174,7 +174,9 @@ endif
 
 test_programs += nwfilterxml2xmltest
 
+if WITH_STORAGE
 test_programs += storagevolxml2argvtest
+endif
 
 test_programs += storagevolxml2xmltest storagepoolxml2xmltest
 
@@ -472,11 +474,15 @@ nwfilterxml2xmltest_SOURCES = \
 	testutils.c testutils.h
 nwfilterxml2xmltest_LDADD = $(LDADDS)
 
+if WITH_STORAGE
 storagevolxml2argvtest_SOURCES = \
     storagevolxml2argvtest.c \
     testutils.c testutils.h
 storagevolxml2argvtest_LDADD = \
 	../src/libvirt_driver_storage_impl.la $(LDADDS)
+else
+EXTRA_DIST += storagevolxml2argvtest.c
+endif
 
 storagevolxml2xmltest_SOURCES = \
 	storagevolxml2xmltest.c \