diff --git a/models/tag.rb b/models/tag.rb
index 4fca3b53..176349e0 100644
--- a/models/tag.rb
+++ b/models/tag.rb
@@ -1,5 +1,5 @@
 class Tag < Sequel::Model
-	NAME_LENGTH_MAX = 20
+	NAME_LENGTH_MAX = 25
 	NAME_WORDS_MAX = 1
   many_to_many :sites
 
diff --git a/tests/acceptance_tests.rb b/tests/acceptance_tests.rb
index f1ea4ade..bc89d063 100644
--- a/tests/acceptance_tests.rb
+++ b/tests/acceptance_tests.rb
@@ -115,7 +115,7 @@ describe 'signup' do
 
   it "fails for tag longer than #{Tag::NAME_LENGTH_MAX} characters" do
     fill_in_valid
-    fill_in 'tags', with: 'helloiamareallylongtagfornoreason lolthisisridiculous'
+    fill_in 'tags', with: SecureRandom.hex(Tag::NAME_LENGTH_MAX)
     click_button 'Create Home Page'
     page.must_have_content /cannot be longer than #{Tag::NAME_LENGTH_MAX}/
   end