diff --git a/dev-perl/Apache-Test/Apache-Test-1.400.0.ebuild b/dev-perl/Apache-Test/Apache-Test-1.400.0.ebuild
new file mode 100644
index 0000000000000..f9d880ab0eee2
--- /dev/null
+++ b/dev-perl/Apache-Test/Apache-Test-1.400.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=SHAY
+DIST_VERSION=1.40
+inherit depend.apache perl-module
+
+DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+# interactive, requires interaction with the live filesystem
+DIST_TEST="skip"
+
+need_apache
+
+pkg_setup() {
+	perl_set_version
+}
+
+src_install() {
+	# This is to avoid conflicts with a deprecated Apache::Test stepping
+	# in and causing problems/install errors
+	if [ -f  "${S}"/.mypacklist ];
+	then
+		rm -f "${S}"/.mypacklist
+	fi
+	perl-module_src_install
+}
diff --git a/dev-perl/Apache-Test/Manifest b/dev-perl/Apache-Test/Manifest
index f74fe51fab8b1..e14f85ce1643a 100644
--- a/dev-perl/Apache-Test/Manifest
+++ b/dev-perl/Apache-Test/Manifest
@@ -1,2 +1,3 @@
 DIST Apache-Test-1.38.tar.gz 150863 SHA256 321717f58636ed0aa85cba6d69fc01e2ccbc90ba71ec2dcc2134d8401af65145 SHA512 416a89990e1947dfd970b806a28b52197165bbe1a482402aa5649f6e2692866a54cc8a4a7adcce83350e2f16aada409fd6c506c0d139b624319c5ebaa58604cc WHIRLPOOL 6f5724b9e56dcd268c8dfa3469b85e6f3f9ef02e9e524386d0af12377d9e560831155913392f04ef9e7b130b0b495e1e5e013a52cd0f4c747507f8f845665e6c
 DIST Apache-Test-1.39.tar.gz 151240 SHA256 d8543864ff29e8ac3d4004c5c7014b1fe490b2024104ac4c24683a74bba62089 SHA512 4f10b0ed856d03aff27aa80d9788f0a2f50eac3523cc7ecf74fec2cda4c881fda2ec096ca238539eb8c4aa2caa4daaa192456f34d00ad8012276c1d87fcc3533 WHIRLPOOL 01a77e14a1464a0caa8154dd4ff68b6b6dc5e7220ae1d4efe63e2a9eb2134ec94d0d5b73c6701de21c0a7d620d1e4bfe2db768c2cd08d9a984609bb7186beaea
+DIST Apache-Test-1.40.tar.gz 151801 SHA256 3cf537f1c81deb549d62be7fd5ee1af439283a9e93f3d13465d01a1d41d4ae40 SHA512 f48a1b93c4d61181670ec59bb8bb2231122b22ec9725d8899a3b2f82d2918fdc48a09494c2f45b0e6a603546481892a948eac3494e06c8eb219a9213e1faadb8 WHIRLPOOL 9456d81354cf4fc22fb67d35053daba43fb0fcdcc6c3ef2c537a6996268371db988bbc335635e3557104430c35ddefbb6a455a8da83eb00fba648fb7cfb17656