diff --git a/lib/DDG/Goodie/Uppercase.pm b/lib/DDG/Goodie/Uppercase.pm
index 6c1bc6025e2..7b15c0ac8a3 100644
--- a/lib/DDG/Goodie/Uppercase.pm
+++ b/lib/DDG/Goodie/Uppercase.pm
@@ -2,7 +2,7 @@ package DDG::Goodie::Uppercase;
 
 use DDG::Goodie;
 
-triggers startend => 'uppercase', 'upper case';
+triggers startend => 'uppercase', 'upper case', 'allcaps', 'all caps';
 
 zci is_cached => 1;
 zci answer_type => "uppercase";
diff --git a/t/Uppercase.t b/t/Uppercase.t
index 968a0be4b07..6f72100d2a7 100644
--- a/t/Uppercase.t
+++ b/t/Uppercase.t
@@ -14,6 +14,9 @@ ddg_goodie_test(
 	)],
 	'upper case this' => test_zci('THIS'),
 	'uppercase that' => test_zci('THAT'),
+        'allcaps this string' => test_zci('THIS STRING'),
+        'that string all caps' => test_zci('THAT STRING'),
+        'is this uppercase, sir?' => undef,
 );
 
 done_testing;