diff --git a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild b/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
index 072bcd2..c642fbd 100644
--- a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 
 inherit autotools fcaps systemd
 
+MY_PN="fort"
+
 DESCRIPTION="FORT validator is an open source RPKI validator"
 HOMEPAGE="https://fortproject.net/validator?2"
 SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-MY_PN="fort"
-
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -33,11 +33,12 @@ BDEPEND="
 	sys-devel/automake
 "
 
-PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
-
 src_prepare() {
 	default
-
+	# Don't strip CFLAGS
+	sed -i 's/fort_CFLAGS  =/fort_CFLAGS  = ${CFLAGS} /' src/Makefile.am || die
+	# Don't test network
+	sed -i '/http/d' test/Makefile.am || die
 	eautoreconf
 }
 
@@ -45,7 +46,7 @@ src_install() {
 	newinitd "${FILESDIR}/${MY_PN}-1.4-initd" ${MY_PN}
 	newconfd "${FILESDIR}/${MY_PN}-1.4-confd" ${MY_PN}
 
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 	insinto /usr/share/${MY_PN}/
 	insopts -m0644 -o "${MY_PN}"
 	diropts -m0755 -o "${MY_PN}"
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
index 15a5660..fa2d973 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 
 inherit autotools fcaps systemd
 
+MY_PN="fort"
+
 DESCRIPTION="FORT validator is an open source RPKI validator"
 HOMEPAGE="https://fortproject.net/validator?2"
 SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-MY_PN="fort"
-
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -33,11 +33,12 @@ BDEPEND="
 	sys-devel/automake
 "
 
-PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
-
 src_prepare() {
 	default
-
+	# Don't strip CFLAGS
+	sed -i 's/fort_CFLAGS  =/fort_CFLAGS  = ${CFLAGS} /' src/Makefile.am || die
+	# Don't test network
+	sed -i '/http/d' test/Makefile.am || die
 	eautoreconf
 }
 
@@ -45,7 +46,7 @@ src_install() {
 	newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN}
 	newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN}
 
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 	insinto /usr/share/${MY_PN}/
 	insopts -m0644 -o "${MY_PN}"
 	diropts -m0755 -o "${MY_PN}"