diff --git a/app/models/group.rb b/app/models/group.rb
index b12c867cb1a..731bb188625 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -89,6 +89,12 @@ class Group < ActiveRecord::Base
     end
   end
 
+  def self.ensure_automatic_groups!
+    AUTO_GROUPS.keys.each do |name|
+      refresh_automatic_group!(name) unless lookup_group(name)
+    end
+  end
+
   def self.[](name)
     lookup_group(name) || refresh_automatic_group!(name)
   end
diff --git a/db/fixtures/groups.rb b/db/fixtures/groups.rb
new file mode 100644
index 00000000000..20e0152cb46
--- /dev/null
+++ b/db/fixtures/groups.rb
@@ -0,0 +1 @@
+Group.ensure_automatic_groups!