diff --git a/Gemfile b/Gemfile
index 984d384..534c55c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'hoptoad_notifier', "~> 2.4"
 gem 'actionmailer_inline_css', "~> 1.3.0"
 gem 'kaminari'
 gem 'rack-ssl-enforcer'
-gem 'fabrication'   # Both for tests, and loading demo data
+gem 'fabrication', "~> 1.3.0"   # Both for tests, and loading demo data
 
 platform :ruby do
   gem 'mongo', '= 1.3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5bcf21e..b04af88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
       mail (~> 2.2)
       rspec (~> 2.0)
     erubis (2.7.0)
-    fabrication (1.4.0)
+    fabrication (1.3.2)
     faraday (0.7.6)
       addressable (~> 2.2)
       multipart-post (~> 1.1)
@@ -217,7 +217,7 @@ DEPENDENCIES
   database_cleaner (~> 0.6.0)
   devise (~> 1.4.0)
   email_spec
-  fabrication
+  fabrication (~> 1.3.0)
   haml
   hoptoad_notifier (~> 2.4)
   htmlentities (~> 4.3.0)
diff --git a/config/application.rb b/config/application.rb
index 24f5d43..1e0a066 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -20,7 +20,7 @@ module Errbit
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += [Rails.root.join("app/models/issue_trackers"), Rails.root.join('lib')]
+    config.autoload_paths += [Rails.root.join('lib')]
 
     # 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/fabricators/issue_tracker_fabricator.rb b/spec/fabricators/issue_tracker_fabricator.rb
index 6cd4cfc..f745bc0 100644
--- a/spec/fabricators/issue_tracker_fabricator.rb
+++ b/spec/fabricators/issue_tracker_fabricator.rb
@@ -8,19 +8,19 @@ Fabricator :issue_tracker do
 end
 
 %w(lighthouse pivotal_labs fogbugz).each do |t|
-  Fabricator "#{t}_tracker".to_sym, :from => :issue_tracker, :class_name => "#{t}_tracker".to_sym
+  Fabricator "#{t}_tracker".to_sym, :from => :issue_tracker, :class_name => "IssueTrackers::#{t.camelcase}Tracker"
 end
 
-Fabricator :redmine_tracker, :from => :issue_tracker, :class_name => :redmine_tracker do
+Fabricator :redmine_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::RedmineTracker" do
   account 'http://redmine.example.com'
 end
 
-Fabricator :mingle_tracker, :from => :issue_tracker, :class_name => :mingle_tracker do
+Fabricator :mingle_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::MingleTracker" do
   account 'https://mingle.example.com'
   ticket_properties 'card_type = Defect, defect_status = open, priority = essential'
 end
 
-Fabricator :github_issues_tracker, :from => :issue_tracker, :class_name => :github_issues_tracker do
+Fabricator :github_issues_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::GithubIssuesTracker" do
   project_id 'test_account/test_project'
   username 'test_username'
 end
diff --git a/spec/models/issue_trackers/fogbugz_tracker_spec.rb b/spec/models/issue_trackers/fogbugz_tracker_spec.rb
index 8f80e10..1e58089 100644
--- a/spec/models/issue_trackers/fogbugz_tracker_spec.rb
+++ b/spec/models/issue_trackers/fogbugz_tracker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FogbugzTracker do
+describe IssueTrackers::FogbugzTracker do
   it "should create an issue on Fogbugz with problem params, and set issue link for problem" do
     notice = Fabricate :notice
     tracker = Fabricate :fogbugz_tracker, :app => notice.app
diff --git a/spec/models/issue_trackers/github_issues_tracker_spec.rb b/spec/models/issue_trackers/github_issues_tracker_spec.rb
index 9642710..0d7f46a 100644
--- a/spec/models/issue_trackers/github_issues_tracker_spec.rb
+++ b/spec/models/issue_trackers/github_issues_tracker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GithubIssuesTracker do
+describe IssueTrackers::GithubIssuesTracker do
   it "should create an issue on Github Issues with problem params, and set issue link for problem" do
     notice = Fabricate :notice
     tracker = Fabricate :github_issues_tracker, :app => notice.app
diff --git a/spec/models/issue_trackers/lighthouse_tracker_spec.rb b/spec/models/issue_trackers/lighthouse_tracker_spec.rb
index 1d1ed98..24b2d2a 100644
--- a/spec/models/issue_trackers/lighthouse_tracker_spec.rb
+++ b/spec/models/issue_trackers/lighthouse_tracker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe LighthouseTracker do
+describe IssueTrackers::LighthouseTracker do
   it "should create an issue on Lighthouse with problem params, and set issue link for problem" do
     notice = Fabricate :notice
     tracker = Fabricate :lighthouse_tracker, :app => notice.app
diff --git a/spec/models/issue_trackers/mingle_tracker_spec.rb b/spec/models/issue_trackers/mingle_tracker_spec.rb
index 24b6359..2e3f164 100644
--- a/spec/models/issue_trackers/mingle_tracker_spec.rb
+++ b/spec/models/issue_trackers/mingle_tracker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MingleTracker do
+describe IssueTrackers::MingleTracker do
   it "should create an issue on Mingle with problem params, and set issue link for problem" do
     notice = Fabricate :notice
     tracker = Fabricate :mingle_tracker, :app => notice.app
diff --git a/spec/models/issue_trackers/pivotal_labs_tracker_spec.rb b/spec/models/issue_trackers/pivotal_labs_tracker_spec.rb
index 9f75559..6cd91d6 100644
--- a/spec/models/issue_trackers/pivotal_labs_tracker_spec.rb
+++ b/spec/models/issue_trackers/pivotal_labs_tracker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PivotalLabsTracker do
+describe IssueTrackers::PivotalLabsTracker do
   it "should create an issue on Pivotal Tracker with problem params, and set issue link for problem" do
     notice = Fabricate :notice
     tracker = Fabricate :pivotal_labs_tracker, :app => notice.app, :project_id => 10
diff --git a/spec/models/issue_trackers/redmine_tracker_spec.rb b/spec/models/issue_trackers/redmine_tracker_spec.rb
index 4634b94..33c6da2 100644
--- a/spec/models/issue_trackers/redmine_tracker_spec.rb
+++ b/spec/models/issue_trackers/redmine_tracker_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RedmineTracker do
+describe IssueTrackers::RedmineTracker do
   it "should create an issue on Redmine with problem params, and set issue link for problem" do
     notice = Fabricate(:notice)
     tracker = Fabricate(:redmine_tracker, :app => notice.app, :project_id => 10)
--
libgit2 0.21.2