diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index 14449893ddbe6..42f024b353cf3 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -5,9 +5,6 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
-	<use>
-		<flag name="valgrind">Enable valgrind in make check</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ukoethe/vigra</remote-id>
 	</upstream>
diff --git a/media-libs/vigra/vigra-1.11.1-r8.ebuild b/media-libs/vigra/vigra-1.11.1-r8.ebuild
index 2c819e9075737..8e05bebbabd40 100644
--- a/media-libs/vigra/vigra-1.11.1-r8.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r8.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
 
 REQUIRED_USE="
 	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
 BDEPEND="
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-		valgrind? ( dev-util/valgrind )
 	)
 "
 # runtime dependency on python is required by the vigra-config script
@@ -113,7 +112,7 @@ src_configure() {
 			-DDOCINSTALL="share/doc/${PF}/html"
 			-DWITH_HDF5=$(usex hdf5)
 			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VALGRIND=OFF # only used for tests
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake_src_configure
diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild
index beb3622e9ca07..ef5236cfe1b78 100644
--- a/media-libs/vigra/vigra-1.11.1-r9.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
 
 REQUIRED_USE="
 	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
 BDEPEND="
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-		valgrind? ( dev-util/valgrind )
 	)
 "
 # runtime dependency on python is required by the vigra-config script
@@ -114,7 +113,7 @@ src_configure() {
 			-DDOCINSTALL="share/doc/${PF}/html"
 			-DWITH_HDF5=$(usex hdf5)
 			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VALGRIND=OFF # only used for tests
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake_src_configure
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 9d414e9529c7c..5a2feab44ca90 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
 
 REQUIRED_USE="
 	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
@@ -29,7 +29,6 @@ REQUIRED_USE="
 BDEPEND="
 	test? (
 		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-		valgrind? ( dev-util/valgrind )
 	)
 "
 # runtime dependency on python is required by the vigra-config script
@@ -107,7 +106,7 @@ src_configure() {
 			-DDOCINSTALL="share/doc/${PF}/html"
 			-DWITH_HDF5=$(usex hdf5)
 			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=$(usex valgrind)
+			-DWITH_VALGRIND=OFF # only used for tests
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
 		cmake_src_configure