diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 93ef3efe415..b46c378d828 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-31  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+	* g++.dg/torture/pr54684.C: Add -fno-short-enums.
+
 2013-05-31  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
 	* gcc.target/arm/pr56184.C: Add -fno-short-enums.
diff --git a/gcc/testsuite/g++.dg/torture/pr54684.C b/gcc/testsuite/g++.dg/torture/pr54684.C
index 40c47f3fa29..4934011e45f 100644
--- a/gcc/testsuite/g++.dg/torture/pr54684.C
+++ b/gcc/testsuite/g++.dg/torture/pr54684.C
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-options "-fno-short-enums" }
 
 typedef union tree_node *tree;
 typedef union gimple_statement_d *gimple;