diff --git a/config/application.rb b/config/application.rb
index d6bb90a3..d71de88e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,7 +16,7 @@ module Gitlab
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/models/concerns)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
diff --git a/spec/lib/issue_commonality_spec.rb b/spec/models/concerns/issuable_spec.rb
similarity index 98%
rename from spec/lib/issue_commonality_spec.rb
rename to spec/models/concerns/issuable_spec.rb
index 11f278de..b5d4bd7b 100644
--- a/spec/lib/issue_commonality_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Issue, "IssueCommonality" do
+describe Issue, "Issuable" do
   let(:issue) { create(:issue) }
 
   describe "Associations" do