diff --git a/spec/models/work_package_action_mailer_spec.rb b/spec/models/work_package/work_package_action_mailer_spec.rb
similarity index 100%
rename from spec/models/work_package_action_mailer_spec.rb
rename to spec/models/work_package/work_package_action_mailer_spec.rb
diff --git a/spec/models/work_package_acts_as_journalized_spec.rb b/spec/models/work_package/work_package_acts_as_journalized_spec.rb
similarity index 100%
rename from spec/models/work_package_acts_as_journalized_spec.rb
rename to spec/models/work_package/work_package_acts_as_journalized_spec.rb
diff --git a/spec/models/work_package_copy_spec.rb b/spec/models/work_package/work_package_copy_spec.rb
similarity index 100%
rename from spec/models/work_package_copy_spec.rb
rename to spec/models/work_package/work_package_copy_spec.rb
diff --git a/spec/models/work_package_custom_fields_spec.rb b/spec/models/work_package/work_package_custom_fields_spec.rb
similarity index 100%
rename from spec/models/work_package_custom_fields_spec.rb
rename to spec/models/work_package/work_package_custom_fields_spec.rb
diff --git a/spec/models/work_package_nested_set_spec.rb b/spec/models/work_package/work_package_nested_set_spec.rb
similarity index 100%
rename from spec/models/work_package_nested_set_spec.rb
rename to spec/models/work_package/work_package_nested_set_spec.rb
diff --git a/spec/models/work_package_planning_spec.rb b/spec/models/work_package/work_package_planning_spec.rb
similarity index 99%
rename from spec/models/work_package_planning_spec.rb
rename to spec/models/work_package/work_package_planning_spec.rb
index 052a31915d..c8fc807483 100644
--- a/spec/models/work_package_planning_spec.rb
+++ b/spec/models/work_package/work_package_planning_spec.rb
@@ -9,7 +9,7 @@
 # See doc/COPYRIGHT.rdoc for more details.
 #++
 
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe WorkPackage do
   let(:project) { FactoryGirl.create(:project_with_types) }
diff --git a/spec/models/work_package_rebuild_nested_set.rb b/spec/models/work_package/work_package_rebuild_nested_set.rb
similarity index 99%
rename from spec/models/work_package_rebuild_nested_set.rb
rename to spec/models/work_package/work_package_rebuild_nested_set.rb
index 7c191478bc..700ddfa304 100644
--- a/spec/models/work_package_rebuild_nested_set.rb
+++ b/spec/models/work_package/work_package_rebuild_nested_set.rb
@@ -10,7 +10,7 @@
 # See doc/COPYRIGHT.rdoc for more details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe WorkPackage, "rebuilding nested set" do
   let(:project) { FactoryGirl.create(:valid_project) }
diff --git a/spec/models/work_package_relations_spec.rb b/spec/models/work_package/work_package_relations_spec.rb
similarity index 100%
rename from spec/models/work_package_relations_spec.rb
rename to spec/models/work_package/work_package_relations_spec.rb
diff --git a/spec/models/work_package_reschedule_after_spec.rb b/spec/models/work_package/work_package_reschedule_after_spec.rb
similarity index 100%
rename from spec/models/work_package_reschedule_after_spec.rb
rename to spec/models/work_package/work_package_reschedule_after_spec.rb
diff --git a/spec/models/work_package_scheduling_spec.rb b/spec/models/work_package/work_package_scheduling_spec.rb
similarity index 100%
rename from spec/models/work_package_scheduling_spec.rb
rename to spec/models/work_package/work_package_scheduling_spec.rb
diff --git a/spec/models/work_package_status_spec.rb b/spec/models/work_package/work_package_status_spec.rb
similarity index 93%
rename from spec/models/work_package_status_spec.rb
rename to spec/models/work_package/work_package_status_spec.rb
index 150138a890..301986e5fa 100644
--- a/spec/models/work_package_status_spec.rb
+++ b/spec/models/work_package/work_package_status_spec.rb
@@ -9,7 +9,7 @@
 # See doc/COPYRIGHT.rdoc for more details.
 #++
 
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe WorkPackage do
   describe '- Relations ' do
diff --git a/spec/models/work_package_validations_spec.rb b/spec/models/work_package/work_package_validations_spec.rb
similarity index 99%
rename from spec/models/work_package_validations_spec.rb
rename to spec/models/work_package/work_package_validations_spec.rb
index 3e275154f3..76cef5ee61 100644
--- a/spec/models/work_package_validations_spec.rb
+++ b/spec/models/work_package/work_package_validations_spec.rb
@@ -146,4 +146,4 @@ describe WorkPackage do
 
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/models/work_package_visibility_spec.rb b/spec/models/work_package/work_package_visibility_spec.rb
similarity index 100%
rename from spec/models/work_package_visibility_spec.rb
rename to spec/models/work_package/work_package_visibility_spec.rb
diff --git a/spec/models/work_package_watcher_spec.rb b/spec/models/work_package/work_package_watcher_spec.rb
similarity index 100%
rename from spec/models/work_package_watcher_spec.rb
rename to spec/models/work_package/work_package_watcher_spec.rb