diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
index c07e76bb4888d..3d0b78c57dfff 100644
--- a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
+++ b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.14-no-games-path.patch
 	"${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch
 	"${FILESDIR}"/${PN}-0.9.16.1-respect-cflags.patch
+	"${FILESDIR}"/${PN}-0.9.16.1-test-libs.patch
 )
 
 src_compile() {
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
new file mode 100644
index 0000000000000..31b27de1d569c
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch
@@ -0,0 +1,10 @@
+Even if not actually used, ensure all symbols are available when linking
+tests to handle cases where unused symbols were not optimized out.
+https://bugs.gentoo.org/894702
+--- a/SConstruct
++++ b/SConstruct
+@@ -172,4 +172,2 @@
+ 	CPPPATH=(env.get('CPPPATH', []) + [pathjoin('tests', 'unit', 'include')]),
+-	# Do not link against the actual implementations of SDL, OpenGL, etc.
+-	LIBS=sys_libs,
+ 	# Pass the necessary link flags for a console program.