diff --git a/app/models/user.rb b/app/models/user.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -7,7 +7,10 @@
 class User < ActiveRecord::Base
 
   has_and_belongs_to_many :roles
-  has_and_belongs_to_many :groups
+
+  #has_and_belongs_to_many :groups
+  has_many :groups_users, class_name: GroupUser
+  has_many :groups, :through => :groups_users
 
   has_many :test_requests, -> {order(submitted_at: DESC)}