diff --git a/storage/inchi/src/test/java/org/openscience/cdk/inchi/InChIGeneratorTest.java b/storage/inchi/src/test/java/org/openscience/cdk/inchi/InChIGeneratorTest.java
index 8b7523dd940..b278db3e6c4 100644
--- a/storage/inchi/src/test/java/org/openscience/cdk/inchi/InChIGeneratorTest.java
+++ b/storage/inchi/src/test/java/org/openscience/cdk/inchi/InChIGeneratorTest.java
@@ -22,6 +22,7 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anyOf;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -905,7 +906,8 @@ public void timeout() throws Exception {
         InChIGenerator generator = inchiFact.getInChIGenerator(mol, "W0.01");
         assertThat(generator.getReturnStatus(), is(INCHI_RET.ERROR));
         assertThat(generator.getMessage(),
-                   containsString("Time limit exceeded"));
+                anyOf(containsString("Time limit exceeded"),
+                      containsString("Structure normalization timeout")));
     }
 
     /**