diff --git a/dev-gap/guava/files/guava-3.20-testfix.patch b/dev-gap/guava/files/guava-3.20-testfix.patch
new file mode 100644
index 0000000000000..ed81d5cedf1e1
--- /dev/null
+++ b/dev-gap/guava/files/guava-3.20-testfix.patch
@@ -0,0 +1,26 @@
+https://github.com/gap-packages/guava/issues/110
+
+diff --git a/tst/guava.tst b/tst/guava.tst
+index c6b356b..fc70f65 100644
+--- a/tst/guava.tst
++++ b/tst/guava.tst
+@@ -100,11 +100,14 @@ gap> Print(" Codes\n");
+ gap> C:=RandomLinearCode(20,10,GF(4));
+ a  [20,10,?] randomly generated code over GF(4)
+ gap> c:=Random(C);;
+-gap> NamesOfComponents(C);
+-[ "Representative", "ZeroImmutable", "name", "LeftActingDomain", "Dimension", 
+-  "GeneratorsOfLeftOperatorAdditiveGroup", "Basis", "NiceFreeLeftModule", 
+-  "WordLength", "GeneratorMat" ]
+-gap> NamesOfComponents(c);
++gap> nC:=NamesOfComponents(C);;
++gap> Sort(nC); nC;
++[ "Basis", "Dimension", "GeneratorMat",
++  "GeneratorsOfLeftOperatorAdditiveGroup", "LeftActingDomain",
++  "NiceFreeLeftModule", "Representative", "WordLength", "ZeroImmutable",
++  "name" ]
++gap> nc:=NamesOfComponents(c);;
++gap> Sort(nc); nc;
+ [ "VectorCodeword", "WordLength", "treatAsPoly" ]
+ gap> c!.VectorCodeword;
+ < immutable compressed vector length 20 over GF(4) >
diff --git a/dev-gap/guava/guava-3.20.ebuild b/dev-gap/guava/guava-3.20.ebuild
index 130975ba1724b..7ffed547cc7f2 100644
--- a/dev-gap/guava/guava-3.20.ebuild
+++ b/dev-gap/guava/guava-3.20.ebuild
@@ -15,6 +15,7 @@ DEPEND="sci-mathematics/gap"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.15-makefile.patch"
+	"${FILESDIR}/${P}-testfix.patch"
 )
 
 GAP_PKG_EXTRA_INSTALL=( tbl )