diff --git a/dev-python/iminuit/iminuit-1.2.ebuild b/dev-python/iminuit/iminuit-1.2.ebuild
index c6e00dbd663d8..7a3e22059eef3 100644
--- a/dev-python/iminuit/iminuit-1.2.ebuild
+++ b/dev-python/iminuit/iminuit-1.2.ebuild
@@ -1,17 +1,29 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-inherit distutils-r1
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 virtualx
 
 DESCRIPTION="Minuit numerical function minimization in Python"
 HOMEPAGE="https://github.com/iminuit/iminuit"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/cython"
-RDEPEND="${DEPEND}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/ipython[${PYTHON_USEDEP}]
+	  dev-python/matplotlib[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	virtx esetup.py test
+}