diff --git a/sci-libs/libpotassco/Manifest b/sci-libs/libpotassco/Manifest
index da926c75d3..8876d854d3 100644
--- a/sci-libs/libpotassco/Manifest
+++ b/sci-libs/libpotassco/Manifest
@@ -1 +1 @@
-DIST libpotassco-0_pre20200612.tar.gz 210167 BLAKE2B 2e7e91674458e28b7d2208b200c5db9f4dace7871a239ebc85fa07d70aee9fa22bf48a41f601ac85b7d083bd62750a08eb98255373a77cb1406dd4b451c42aa4 SHA512 649cc07a2fcdea98ece9a3515e2ccc451e8fb6046642be1a8cd09919e100cf215376703690430ae58b8f5d9dab53b4e0bc4b0f3b19e4ff16bd0b62bfe20404fd
+DIST libpotassco-0_pre20200612-r1.tar.gz 210167 BLAKE2B 2e7e91674458e28b7d2208b200c5db9f4dace7871a239ebc85fa07d70aee9fa22bf48a41f601ac85b7d083bd62750a08eb98255373a77cb1406dd4b451c42aa4 SHA512 649cc07a2fcdea98ece9a3515e2ccc451e8fb6046642be1a8cd09919e100cf215376703690430ae58b8f5d9dab53b4e0bc4b0f3b19e4ff16bd0b62bfe20404fd
diff --git a/sci-libs/libpotassco/libpotassco-0_pre20200612.ebuild b/sci-libs/libpotassco/libpotassco-0_pre20200612-r1.ebuild
similarity index 80%
rename from sci-libs/libpotassco/libpotassco-0_pre20200612.ebuild
rename to sci-libs/libpotassco/libpotassco-0_pre20200612-r1.ebuild
index ef13e8f96d..7f13cf089f 100644
--- a/sci-libs/libpotassco/libpotassco-0_pre20200612.ebuild
+++ b/sci-libs/libpotassco/libpotassco-0_pre20200612-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 COMMIT="2f2b80feac1e35cbe1cae986c44dbb20d4151c74"
 
@@ -17,9 +17,17 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test tools"
 
+DEPEND="test? ( dev-cpp/catch:1 )"
+
 RESTRICT="!test? ( test )"
 
+src_prepare() {
+	rm tests/catch.hpp || die
+	cmake_src_prepare
+}
+
 src_configure() {
+	append-cxxflags "-I/usr/include/catch"
 	local mycmakeargs=(
 		-DLIB_POTASSCO_BUILD_TESTS=$(usex test)
 		-DLIB_POTASSCO_BUILD_APP=$(usex tools)