diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index c9a62fec1..8f04f301a 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -6,9 +6,9 @@ if Rails.env=='ci'
     desc 'Run tests depending on the TEST_SUITE env variable: "unit"=>unit tests, "acceptance"=>acceptance tests'
     RSpec::Core::RakeTask.new(:travisci) do |task|
       all_tests = FileList['spec/**/*_spec.rb']
-      unit_tests = FileList['spec/**/*_spec.rb'].exclude 'spec/features/**/*_spec.rb'
-      acceptance_tests_1 = FileList['spec/features/suite_1/**/*_spec.rb']
-      acceptance_tests_2 = FileList['spec/features/suite_2/**/*_spec.rb']
+      unit_tests = FileList['spec/unit_tests/**/*_spec.rb']
+      acceptance_tests_1 = FileList['spec/acceptance_tests/suite_1/**/*_spec.rb']
+      acceptance_tests_2 = FileList['spec/acceptance_tests/suite_2/**/*_spec.rb']
 
       if ENV['TEST_SUITE'] == 'unit'
         # Include only unit tests
diff --git a/spec/features/suite_1/alert_closing_spec.rb b/spec/acceptance_tests/suite_1/alert_closing_spec.rb
similarity index 92%
rename from spec/features/suite_1/alert_closing_spec.rb
rename to spec/acceptance_tests/suite_1/alert_closing_spec.rb
index 2b9911d7c..9d63188d2 100644
--- a/spec/features/suite_1/alert_closing_spec.rb
+++ b/spec/acceptance_tests/suite_1/alert_closing_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'automatically closing notices and alerts' do
+describe 'automatically closing notices and alerts', type: :feature do
   before :each do
     @user = FactoryGirl.create :user
   end
diff --git a/spec/features/suite_1/authentication_spec.rb b/spec/acceptance_tests/suite_1/authentication_spec.rb
similarity index 99%
rename from spec/features/suite_1/authentication_spec.rb
rename to spec/acceptance_tests/suite_1/authentication_spec.rb
index 8d0f80ce3..6afdf36fd 100644
--- a/spec/features/suite_1/authentication_spec.rb
+++ b/spec/acceptance_tests/suite_1/authentication_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'authentication' do
+describe 'authentication', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/features/suite_1/authorization_spec.rb b/spec/acceptance_tests/suite_1/authorization_spec.rb
similarity index 97%
rename from spec/features/suite_1/authorization_spec.rb
rename to spec/acceptance_tests/suite_1/authorization_spec.rb
index f78fe7dab..ac5af657c 100644
--- a/spec/features/suite_1/authorization_spec.rb
+++ b/spec/acceptance_tests/suite_1/authorization_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'authorization' do
+describe 'authorization', type: :feature do
 
   before :each do
     @normal_user = FactoryGirl.create :user
diff --git a/spec/features/suite_1/export_subscriptions_spec.rb b/spec/acceptance_tests/suite_1/export_subscriptions_spec.rb
similarity index 99%
rename from spec/features/suite_1/export_subscriptions_spec.rb
rename to spec/acceptance_tests/suite_1/export_subscriptions_spec.rb
index 3c25898d4..24e0b6679 100644
--- a/spec/features/suite_1/export_subscriptions_spec.rb
+++ b/spec/acceptance_tests/suite_1/export_subscriptions_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'export subscriptions' do
+describe 'export subscriptions', type: :feature do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed
diff --git a/spec/features/suite_1/feeds_spec.rb b/spec/acceptance_tests/suite_1/feeds_spec.rb
similarity index 99%
rename from spec/features/suite_1/feeds_spec.rb
rename to spec/acceptance_tests/suite_1/feeds_spec.rb
index 49d2156f4..0d43553aa 100644
--- a/spec/features/suite_1/feeds_spec.rb
+++ b/spec/acceptance_tests/suite_1/feeds_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'feeds' do
+describe 'feeds', type: :feature do
 
   it 'redirects unauthenticated visitors to login page' do
     visit read_path
diff --git a/spec/features/suite_1/folders_spec.rb b/spec/acceptance_tests/suite_1/folders_spec.rb
similarity index 99%
rename from spec/features/suite_1/folders_spec.rb
rename to spec/acceptance_tests/suite_1/folders_spec.rb
index 7069ec7bd..26d279a56 100644
--- a/spec/features/suite_1/folders_spec.rb
+++ b/spec/acceptance_tests/suite_1/folders_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'folders and feeds' do
+describe 'folders and feeds', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/features/suite_1/refresh_feed_spec.rb b/spec/acceptance_tests/suite_1/refresh_feed_spec.rb
similarity index 99%
rename from spec/features/suite_1/refresh_feed_spec.rb
rename to spec/acceptance_tests/suite_1/refresh_feed_spec.rb
index f140a9de3..d0dbbeea7 100644
--- a/spec/features/suite_1/refresh_feed_spec.rb
+++ b/spec/acceptance_tests/suite_1/refresh_feed_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'refresh feeds' do
+describe 'refresh feeds', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/features/suite_1/start_page_spec.rb b/spec/acceptance_tests/suite_1/start_page_spec.rb
similarity index 99%
rename from spec/features/suite_1/start_page_spec.rb
rename to spec/acceptance_tests/suite_1/start_page_spec.rb
index f81fb8a61..d7e28aa10 100644
--- a/spec/features/suite_1/start_page_spec.rb
+++ b/spec/acceptance_tests/suite_1/start_page_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'start page' do
+describe 'start page', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/features/suite_2/entries_spec.rb b/spec/acceptance_tests/suite_2/entries_spec.rb
similarity index 99%
rename from spec/features/suite_2/entries_spec.rb
rename to spec/acceptance_tests/suite_2/entries_spec.rb
index c06882a83..f3af0664d 100644
--- a/spec/features/suite_2/entries_spec.rb
+++ b/spec/acceptance_tests/suite_2/entries_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'feed entries' do
+describe 'feed entries', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/features/suite_2/feed_subscription_spec.rb b/spec/acceptance_tests/suite_2/feed_subscription_spec.rb
similarity index 99%
rename from spec/features/suite_2/feed_subscription_spec.rb
rename to spec/acceptance_tests/suite_2/feed_subscription_spec.rb
index 97e47c602..c5712b949 100644
--- a/spec/features/suite_2/feed_subscription_spec.rb
+++ b/spec/acceptance_tests/suite_2/feed_subscription_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'subscription to feeds' do
+describe 'subscription to feeds', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/features/suite_2/feed_unsubscribe_spec.rb b/spec/acceptance_tests/suite_2/feed_unsubscribe_spec.rb
similarity index 99%
rename from spec/features/suite_2/feed_unsubscribe_spec.rb
rename to spec/acceptance_tests/suite_2/feed_unsubscribe_spec.rb
index 0c651e2cb..dc2d20f74 100644
--- a/spec/features/suite_2/feed_unsubscribe_spec.rb
+++ b/spec/acceptance_tests/suite_2/feed_unsubscribe_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'unsubscribe from feed' do
+describe 'unsubscribe from feed', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/features/suite_2/import_subscriptions_spec.rb b/spec/acceptance_tests/suite_2/import_subscriptions_spec.rb
similarity index 99%
rename from spec/features/suite_2/import_subscriptions_spec.rb
rename to spec/acceptance_tests/suite_2/import_subscriptions_spec.rb
index 7dce709e6..458f3202e 100644
--- a/spec/features/suite_2/import_subscriptions_spec.rb
+++ b/spec/acceptance_tests/suite_2/import_subscriptions_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'import subscriptions' do
+describe 'import subscriptions', type: :feature do
   before :each do
     @data_file = File.join __dir__, '..', '..', 'attachments', 'feedbunch@gmail.com-takeout.zip'
 
diff --git a/spec/features/suite_2/quick_reading_spec.rb b/spec/acceptance_tests/suite_2/quick_reading_spec.rb
similarity index 99%
rename from spec/features/suite_2/quick_reading_spec.rb
rename to spec/acceptance_tests/suite_2/quick_reading_spec.rb
index 0c7e1bf7b..c391bb77d 100644
--- a/spec/features/suite_2/quick_reading_spec.rb
+++ b/spec/acceptance_tests/suite_2/quick_reading_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'quick reading mode' do
+describe 'quick reading mode', type: :feature do
 
   context 'mark entries open when scrolling' do
 
diff --git a/spec/features/suite_2/unread_entries_count_spec.rb b/spec/acceptance_tests/suite_2/unread_entries_count_spec.rb
similarity index 99%
rename from spec/features/suite_2/unread_entries_count_spec.rb
rename to spec/acceptance_tests/suite_2/unread_entries_count_spec.rb
index 4a0c7e8c0..c870be913 100644
--- a/spec/features/suite_2/unread_entries_count_spec.rb
+++ b/spec/acceptance_tests/suite_2/unread_entries_count_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'unread entries count' do
+describe 'unread entries count', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/clients/feed_client/atom_feeds_spec.rb b/spec/unit_tests/clients/feed_client/atom_feeds_spec.rb
similarity index 100%
rename from spec/clients/feed_client/atom_feeds_spec.rb
rename to spec/unit_tests/clients/feed_client/atom_feeds_spec.rb
diff --git a/spec/clients/feed_client/feed_client_spec.rb b/spec/unit_tests/clients/feed_client/feed_client_spec.rb
similarity index 100%
rename from spec/clients/feed_client/feed_client_spec.rb
rename to spec/unit_tests/clients/feed_client/feed_client_spec.rb
diff --git a/spec/clients/feed_client/iso-8859-1_feeds_spec.rb b/spec/unit_tests/clients/feed_client/iso-8859-1_feeds_spec.rb
similarity index 100%
rename from spec/clients/feed_client/iso-8859-1_feeds_spec.rb
rename to spec/unit_tests/clients/feed_client/iso-8859-1_feeds_spec.rb
diff --git a/spec/clients/feed_client/itunes_feeds_spec.rb b/spec/unit_tests/clients/feed_client/itunes_feeds_spec.rb
similarity index 100%
rename from spec/clients/feed_client/itunes_feeds_spec.rb
rename to spec/unit_tests/clients/feed_client/itunes_feeds_spec.rb
diff --git a/spec/clients/feed_client/rss2_feeds_spec.rb b/spec/unit_tests/clients/feed_client/rss2_feeds_spec.rb
similarity index 100%
rename from spec/clients/feed_client/rss2_feeds_spec.rb
rename to spec/unit_tests/clients/feed_client/rss2_feeds_spec.rb
diff --git a/spec/clients/file_client_spec.rb b/spec/unit_tests/clients/file_client_spec.rb
similarity index 100%
rename from spec/clients/file_client_spec.rb
rename to spec/unit_tests/clients/file_client_spec.rb
diff --git a/spec/clients/s3_client_spec.rb b/spec/unit_tests/clients/s3_client_spec.rb
similarity index 100%
rename from spec/clients/s3_client_spec.rb
rename to spec/unit_tests/clients/s3_client_spec.rb
diff --git a/spec/controllers/entries_controller_spec.rb b/spec/unit_tests/controllers/entries_controller_spec.rb
similarity index 99%
rename from spec/controllers/entries_controller_spec.rb
rename to spec/unit_tests/controllers/entries_controller_spec.rb
index 5111e4117..b4895ee08 100644
--- a/spec/controllers/entries_controller_spec.rb
+++ b/spec/unit_tests/controllers/entries_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::EntriesController do
+describe Api::EntriesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/feeds_controller_spec.rb b/spec/unit_tests/controllers/feeds_controller_spec.rb
similarity index 98%
rename from spec/controllers/feeds_controller_spec.rb
rename to spec/unit_tests/controllers/feeds_controller_spec.rb
index 49135adf4..eac5530d6 100644
--- a/spec/controllers/feeds_controller_spec.rb
+++ b/spec/unit_tests/controllers/feeds_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::FeedsController do
+describe Api::FeedsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/folders_controller_spec.rb b/spec/unit_tests/controllers/folders_controller_spec.rb
similarity index 98%
rename from spec/controllers/folders_controller_spec.rb
rename to spec/unit_tests/controllers/folders_controller_spec.rb
index 7ffe86e57..c97ab6518 100644
--- a/spec/controllers/folders_controller_spec.rb
+++ b/spec/unit_tests/controllers/folders_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::FoldersController do
+describe Api::FoldersController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/opml_exports_controller_spec.rb b/spec/unit_tests/controllers/opml_exports_controller_spec.rb
similarity index 98%
rename from spec/controllers/opml_exports_controller_spec.rb
rename to spec/unit_tests/controllers/opml_exports_controller_spec.rb
index 544678ccf..ab0e7e860 100644
--- a/spec/controllers/opml_exports_controller_spec.rb
+++ b/spec/unit_tests/controllers/opml_exports_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::OpmlExportsController do
+describe Api::OpmlExportsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/opml_imports_controller_spec.rb b/spec/unit_tests/controllers/opml_imports_controller_spec.rb
similarity index 97%
rename from spec/controllers/opml_imports_controller_spec.rb
rename to spec/unit_tests/controllers/opml_imports_controller_spec.rb
index 3fdfc4095..3d16c21e8 100644
--- a/spec/controllers/opml_imports_controller_spec.rb
+++ b/spec/unit_tests/controllers/opml_imports_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::OpmlImportsController do
+describe Api::OpmlImportsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/unit_tests/controllers/profiles_controller_spec.rb
similarity index 94%
rename from spec/controllers/profiles_controller_spec.rb
rename to spec/unit_tests/controllers/profiles_controller_spec.rb
index b377ebd41..a9d7064b8 100644
--- a/spec/controllers/profiles_controller_spec.rb
+++ b/spec/unit_tests/controllers/profiles_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Devise::ProfilesController do
+describe Devise::ProfilesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/read_controller_spec.rb b/spec/unit_tests/controllers/read_controller_spec.rb
similarity index 91%
rename from spec/controllers/read_controller_spec.rb
rename to spec/unit_tests/controllers/read_controller_spec.rb
index 97959c763..70530efbf 100644
--- a/spec/controllers/read_controller_spec.rb
+++ b/spec/unit_tests/controllers/read_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ReadController do
+describe ReadController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/refresh_feed_job_states_controller_spec.rb b/spec/unit_tests/controllers/refresh_feed_job_states_controller_spec.rb
similarity index 97%
rename from spec/controllers/refresh_feed_job_states_controller_spec.rb
rename to spec/unit_tests/controllers/refresh_feed_job_states_controller_spec.rb
index db360b649..a323937ff 100644
--- a/spec/controllers/refresh_feed_job_states_controller_spec.rb
+++ b/spec/unit_tests/controllers/refresh_feed_job_states_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::RefreshFeedJobStatesController do
+describe Api::RefreshFeedJobStatesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/subscribe_job_states_controller_spec.rb b/spec/unit_tests/controllers/subscribe_job_states_controller_spec.rb
similarity index 97%
rename from spec/controllers/subscribe_job_states_controller_spec.rb
rename to spec/unit_tests/controllers/subscribe_job_states_controller_spec.rb
index 79c377863..968117cc2 100644
--- a/spec/controllers/subscribe_job_states_controller_spec.rb
+++ b/spec/unit_tests/controllers/subscribe_job_states_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::SubscribeJobStatesController do
+describe Api::SubscribeJobStatesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/user_configs_controller_spec.rb b/spec/unit_tests/controllers/user_configs_controller_spec.rb
similarity index 81%
rename from spec/controllers/user_configs_controller_spec.rb
rename to spec/unit_tests/controllers/user_configs_controller_spec.rb
index f8c7ae044..ed883c823 100644
--- a/spec/controllers/user_configs_controller_spec.rb
+++ b/spec/unit_tests/controllers/user_configs_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::UserConfigsController do
+describe Api::UserConfigsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/controllers/user_data_controller_spec.rb b/spec/unit_tests/controllers/user_data_controller_spec.rb
similarity index 82%
rename from spec/controllers/user_data_controller_spec.rb
rename to spec/unit_tests/controllers/user_data_controller_spec.rb
index 7ddab35e9..79931fca6 100644
--- a/spec/controllers/user_data_controller_spec.rb
+++ b/spec/unit_tests/controllers/user_data_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::UserDataController do
+describe Api::UserDataController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/jobs/destroy_old_job_states_job_spec.rb b/spec/unit_tests/jobs/destroy_old_job_states_job_spec.rb
similarity index 100%
rename from spec/jobs/destroy_old_job_states_job_spec.rb
rename to spec/unit_tests/jobs/destroy_old_job_states_job_spec.rb
diff --git a/spec/jobs/destroy_user_job_spec.rb b/spec/unit_tests/jobs/destroy_user_job_spec.rb
similarity index 100%
rename from spec/jobs/destroy_user_job_spec.rb
rename to spec/unit_tests/jobs/destroy_user_job_spec.rb
diff --git a/spec/jobs/export_subscriptions_job_spec.rb b/spec/unit_tests/jobs/export_subscriptions_job_spec.rb
similarity index 100%
rename from spec/jobs/export_subscriptions_job_spec.rb
rename to spec/unit_tests/jobs/export_subscriptions_job_spec.rb
diff --git a/spec/jobs/fix_schedules_job_spec.rb b/spec/unit_tests/jobs/fix_schedules_job_spec.rb
similarity index 100%
rename from spec/jobs/fix_schedules_job_spec.rb
rename to spec/unit_tests/jobs/fix_schedules_job_spec.rb
diff --git a/spec/jobs/import_subscriptions_job_spec.rb b/spec/unit_tests/jobs/import_subscriptions_job_spec.rb
similarity index 100%
rename from spec/jobs/import_subscriptions_job_spec.rb
rename to spec/unit_tests/jobs/import_subscriptions_job_spec.rb
diff --git a/spec/jobs/refresh_feed_job_spec.rb b/spec/unit_tests/jobs/refresh_feed_job_spec.rb
similarity index 100%
rename from spec/jobs/refresh_feed_job_spec.rb
rename to spec/unit_tests/jobs/refresh_feed_job_spec.rb
diff --git a/spec/jobs/scheduled_update_feed_job_spec.rb b/spec/unit_tests/jobs/scheduled_update_feed_job_spec.rb
similarity index 100%
rename from spec/jobs/scheduled_update_feed_job_spec.rb
rename to spec/unit_tests/jobs/scheduled_update_feed_job_spec.rb
diff --git a/spec/jobs/subscribe_user_job_spec.rb b/spec/unit_tests/jobs/subscribe_user_job_spec.rb
similarity index 100%
rename from spec/jobs/subscribe_user_job_spec.rb
rename to spec/unit_tests/jobs/subscribe_user_job_spec.rb
diff --git a/spec/jobs/unsubscribe_user_job_spec.rb b/spec/unit_tests/jobs/unsubscribe_user_job_spec.rb
similarity index 100%
rename from spec/jobs/unsubscribe_user_job_spec.rb
rename to spec/unit_tests/jobs/unsubscribe_user_job_spec.rb
diff --git a/spec/jobs/update_feed_unread_count_job_spec.rb b/spec/unit_tests/jobs/update_feed_unread_count_job_spec.rb
similarity index 100%
rename from spec/jobs/update_feed_unread_count_job_spec.rb
rename to spec/unit_tests/jobs/update_feed_unread_count_job_spec.rb
diff --git a/spec/models/deleted_entry_spec.rb b/spec/unit_tests/models/deleted_entry_spec.rb
similarity index 97%
rename from spec/models/deleted_entry_spec.rb
rename to spec/unit_tests/models/deleted_entry_spec.rb
index a8f67a440..d58a29dd1 100644
--- a/spec/models/deleted_entry_spec.rb
+++ b/spec/unit_tests/models/deleted_entry_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DeletedEntry do
+describe DeletedEntry, type: :model do
 
   before :each do
     @deleted_entry = FactoryGirl.create :deleted_entry
diff --git a/spec/models/entry_spec.rb b/spec/unit_tests/models/entry_spec.rb
similarity index 99%
rename from spec/models/entry_spec.rb
rename to spec/unit_tests/models/entry_spec.rb
index 8dba5b764..65ac9faea 100644
--- a/spec/models/entry_spec.rb
+++ b/spec/unit_tests/models/entry_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Entry do
+describe Entry, type: :model do
 
   before :each do
     @entry = FactoryGirl.create :entry
diff --git a/spec/models/entry_state_spec.rb b/spec/unit_tests/models/entry_state_spec.rb
similarity index 98%
rename from spec/models/entry_state_spec.rb
rename to spec/unit_tests/models/entry_state_spec.rb
index 5c0bc3ece..9407cc982 100644
--- a/spec/models/entry_state_spec.rb
+++ b/spec/unit_tests/models/entry_state_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe EntryState do
+describe EntryState, type: :model do
 
   context 'validations' do
 
diff --git a/spec/models/feed_spec.rb b/spec/unit_tests/models/feed_spec.rb
similarity index 99%
rename from spec/models/feed_spec.rb
rename to spec/unit_tests/models/feed_spec.rb
index 98669ddf3..827197109 100644
--- a/spec/models/feed_spec.rb
+++ b/spec/unit_tests/models/feed_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Feed do
+describe Feed, type: :model do
 
   before :each do
     @feed = FactoryGirl.create :feed
diff --git a/spec/models/feed_subscription_spec.rb b/spec/unit_tests/models/feed_subscription_spec.rb
similarity index 98%
rename from spec/models/feed_subscription_spec.rb
rename to spec/unit_tests/models/feed_subscription_spec.rb
index 93ca49d9e..649bb2698 100644
--- a/spec/models/feed_subscription_spec.rb
+++ b/spec/unit_tests/models/feed_subscription_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FeedSubscription do
+describe FeedSubscription, type: :model do
 
   before :each do
     @feed_subscription = FactoryGirl.create :feed_subscription
diff --git a/spec/models/folder_spec.rb b/spec/unit_tests/models/folder_spec.rb
similarity index 99%
rename from spec/models/folder_spec.rb
rename to spec/unit_tests/models/folder_spec.rb
index a28368d68..7c99d375c 100644
--- a/spec/models/folder_spec.rb
+++ b/spec/unit_tests/models/folder_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Folder do
+describe Folder, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @folder = FactoryGirl.build :folder, user_id: @user.id
diff --git a/spec/models/opml_export_job_state_spec.rb b/spec/unit_tests/models/opml_export_job_state_spec.rb
similarity index 99%
rename from spec/models/opml_export_job_state_spec.rb
rename to spec/unit_tests/models/opml_export_job_state_spec.rb
index 79d11c50a..f14ca9dec 100644
--- a/spec/models/opml_export_job_state_spec.rb
+++ b/spec/unit_tests/models/opml_export_job_state_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe OpmlExportJobState do
+describe OpmlExportJobState, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/models/opml_import_job_state_spec.rb b/spec/unit_tests/models/opml_import_job_state_spec.rb
similarity index 96%
rename from spec/models/opml_import_job_state_spec.rb
rename to spec/unit_tests/models/opml_import_job_state_spec.rb
index 5cec23bbd..4a47f9ebb 100644
--- a/spec/models/opml_import_job_state_spec.rb
+++ b/spec/unit_tests/models/opml_import_job_state_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe OpmlImportJobState do
+describe OpmlImportJobState, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/models/refresh_feed_job_state_spec.rb b/spec/unit_tests/models/refresh_feed_job_state_spec.rb
similarity index 93%
rename from spec/models/refresh_feed_job_state_spec.rb
rename to spec/unit_tests/models/refresh_feed_job_state_spec.rb
index d597fa842..14e953522 100644
--- a/spec/models/refresh_feed_job_state_spec.rb
+++ b/spec/unit_tests/models/refresh_feed_job_state_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RefreshFeedJobState do
+describe RefreshFeedJobState, type: :model do
 
   context 'validations' do
 
diff --git a/spec/models/subscribe_job_state_spec.rb b/spec/unit_tests/models/subscribe_job_state_spec.rb
similarity index 97%
rename from spec/models/subscribe_job_state_spec.rb
rename to spec/unit_tests/models/subscribe_job_state_spec.rb
index 9080c25a2..2fd0ef0b1 100644
--- a/spec/models/subscribe_job_state_spec.rb
+++ b/spec/unit_tests/models/subscribe_job_state_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SubscribeJobState do
+describe SubscribeJobState, type: :model do
 
   context 'validations' do
 
diff --git a/spec/models/user/user_change_entry_state_spec.rb b/spec/unit_tests/models/user/user_change_entry_state_spec.rb
similarity index 99%
rename from spec/models/user/user_change_entry_state_spec.rb
rename to spec/unit_tests/models/user/user_change_entry_state_spec.rb
index f4b99185b..9e35ac972 100644
--- a/spec/models/user/user_change_entry_state_spec.rb
+++ b/spec/unit_tests/models/user/user_change_entry_state_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed
diff --git a/spec/models/user/user_delete_profile_spec.rb b/spec/unit_tests/models/user/user_delete_profile_spec.rb
similarity index 94%
rename from spec/models/user/user_delete_profile_spec.rb
rename to spec/unit_tests/models/user/user_delete_profile_spec.rb
index c5d247ead..968bc1373 100644
--- a/spec/models/user/user_delete_profile_spec.rb
+++ b/spec/unit_tests/models/user/user_delete_profile_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end
diff --git a/spec/models/user/user_export_subscriptions_spec.rb b/spec/unit_tests/models/user/user_export_subscriptions_spec.rb
similarity index 99%
rename from spec/models/user/user_export_subscriptions_spec.rb
rename to spec/unit_tests/models/user/user_export_subscriptions_spec.rb
index 56e6feabd..e250f70e4 100644
--- a/spec/models/user/user_export_subscriptions_spec.rb
+++ b/spec/unit_tests/models/user/user_export_subscriptions_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end
diff --git a/spec/models/user/user_import_subscriptions_spec.rb b/spec/unit_tests/models/user/user_import_subscriptions_spec.rb
similarity index 99%
rename from spec/models/user/user_import_subscriptions_spec.rb
rename to spec/unit_tests/models/user/user_import_subscriptions_spec.rb
index 546e87833..094e59cee 100644
--- a/spec/models/user/user_import_subscriptions_spec.rb
+++ b/spec/unit_tests/models/user/user_import_subscriptions_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end
diff --git a/spec/models/user/user_move_feed_to_existing_folder_spec.rb b/spec/unit_tests/models/user/user_move_feed_to_existing_folder_spec.rb
similarity index 98%
rename from spec/models/user/user_move_feed_to_existing_folder_spec.rb
rename to spec/unit_tests/models/user/user_move_feed_to_existing_folder_spec.rb
index 313e0da44..51e572e9c 100644
--- a/spec/models/user/user_move_feed_to_existing_folder_spec.rb
+++ b/spec/unit_tests/models/user/user_move_feed_to_existing_folder_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @folder = FactoryGirl.build :folder, user_id: @user.id
diff --git a/spec/models/user/user_move_feed_to_new_folder_spec.rb b/spec/unit_tests/models/user/user_move_feed_to_new_folder_spec.rb
similarity index 98%
rename from spec/models/user/user_move_feed_to_new_folder_spec.rb
rename to spec/unit_tests/models/user/user_move_feed_to_new_folder_spec.rb
index 03c7bbee3..5f72b8b1b 100644
--- a/spec/models/user/user_move_feed_to_new_folder_spec.rb
+++ b/spec/unit_tests/models/user/user_move_feed_to_new_folder_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed
diff --git a/spec/models/user/user_refresh_feed_spec.rb b/spec/unit_tests/models/user/user_refresh_feed_spec.rb
similarity index 98%
rename from spec/models/user/user_refresh_feed_spec.rb
rename to spec/unit_tests/models/user/user_refresh_feed_spec.rb
index fd964c3f4..f5a2b4927 100644
--- a/spec/models/user/user_refresh_feed_spec.rb
+++ b/spec/unit_tests/models/user/user_refresh_feed_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/models/user/user_remove_feed_from_folder_spec.rb b/spec/unit_tests/models/user/user_remove_feed_from_folder_spec.rb
similarity index 97%
rename from spec/models/user/user_remove_feed_from_folder_spec.rb
rename to spec/unit_tests/models/user/user_remove_feed_from_folder_spec.rb
index 4031c9a2c..9ad098412 100644
--- a/spec/models/user/user_remove_feed_from_folder_spec.rb
+++ b/spec/unit_tests/models/user/user_remove_feed_from_folder_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed
diff --git a/spec/models/user/user_retrieve_entries_spec.rb b/spec/unit_tests/models/user/user_retrieve_entries_spec.rb
similarity index 99%
rename from spec/models/user/user_retrieve_entries_spec.rb
rename to spec/unit_tests/models/user/user_retrieve_entries_spec.rb
index 040ccbddd..4c28b740a 100644
--- a/spec/models/user/user_retrieve_entries_spec.rb
+++ b/spec/unit_tests/models/user/user_retrieve_entries_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/models/user/user_retrieve_feeds_spec.rb b/spec/unit_tests/models/user/user_retrieve_feeds_spec.rb
similarity index 99%
rename from spec/models/user/user_retrieve_feeds_spec.rb
rename to spec/unit_tests/models/user/user_retrieve_feeds_spec.rb
index ecdbdfbdb..dd7c00e71 100644
--- a/spec/models/user/user_retrieve_feeds_spec.rb
+++ b/spec/unit_tests/models/user/user_retrieve_feeds_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user
diff --git a/spec/models/user/user_spec.rb b/spec/unit_tests/models/user/user_spec.rb
similarity index 99%
rename from spec/models/user/user_spec.rb
rename to spec/unit_tests/models/user/user_spec.rb
index 7e0728e66..30551bbf7 100644
--- a/spec/models/user/user_spec.rb
+++ b/spec/unit_tests/models/user/user_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end
diff --git a/spec/models/user/user_subscribe_to_feed_spec.rb b/spec/unit_tests/models/user/user_subscribe_to_feed_spec.rb
similarity index 99%
rename from spec/models/user/user_subscribe_to_feed_spec.rb
rename to spec/unit_tests/models/user/user_subscribe_to_feed_spec.rb
index ea1c3d452..38f0e68c5 100644
--- a/spec/models/user/user_subscribe_to_feed_spec.rb
+++ b/spec/unit_tests/models/user/user_subscribe_to_feed_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed
diff --git a/spec/models/user/user_unread_entries_caching_spec.rb b/spec/unit_tests/models/user/user_unread_entries_caching_spec.rb
similarity index 98%
rename from spec/models/user/user_unread_entries_caching_spec.rb
rename to spec/unit_tests/models/user/user_unread_entries_caching_spec.rb
index b02658764..7e8f4147f 100644
--- a/spec/models/user/user_unread_entries_caching_spec.rb
+++ b/spec/unit_tests/models/user/user_unread_entries_caching_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed
diff --git a/spec/models/user/user_unsubscribe_from_feed_spec.rb b/spec/unit_tests/models/user/user_unsubscribe_from_feed_spec.rb
similarity index 98%
rename from spec/models/user/user_unsubscribe_from_feed_spec.rb
rename to spec/unit_tests/models/user/user_unsubscribe_from_feed_spec.rb
index 70e887868..4a006968e 100644
--- a/spec/models/user/user_unsubscribe_from_feed_spec.rb
+++ b/spec/unit_tests/models/user/user_unsubscribe_from_feed_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed