diff --git a/spec/features/playlists_spec.rb b/spec/features/playlists/crud_spec.rb
similarity index 96%
rename from spec/features/playlists_spec.rb
rename to spec/features/playlists/crud_spec.rb
index 9cef26e..f9ed0aa 100644
--- a/spec/features/playlists_spec.rb
+++ b/spec/features/playlists/crud_spec.rb
@@ -1,4 +1,4 @@
-feature 'Playlists' do
+feature 'Playlists CRUD' do
   include UserIntegrationHelpers
 
   background { sign_in }
diff --git a/spec/features/user_sign_in_spec.rb b/spec/features/sessions/sign_in_spec.rb
similarity index 100%
rename from spec/features/user_sign_in_spec.rb
rename to spec/features/sessions/sign_in_spec.rb
diff --git a/spec/features/user_sign_up_spec.rb b/spec/features/sessions/sign_up_spec.rb
similarity index 100%
rename from spec/features/user_sign_up_spec.rb
rename to spec/features/sessions/sign_up_spec.rb
diff --git a/spec/features/tracks_spec.rb b/spec/features/tracks/crud_spec.rb
similarity index 69%
rename from spec/features/tracks_spec.rb
rename to spec/features/tracks/crud_spec.rb
index ef24f6e..6f228c8 100644
--- a/spec/features/tracks_spec.rb
+++ b/spec/features/tracks/crud_spec.rb
@@ -1,4 +1,4 @@
-feature 'Tracks' do
+feature 'Tracks CRUD' do
   include UserIntegrationHelpers
 
   background { sign_in }
@@ -22,13 +22,4 @@ feature 'Tracks' do
     expect(current_path).to eq track_path Track.first
     expect(page).to have_content 'Mega song'
   end
-
-  scenario 'plays track' do
-    track = FactoryGirl.create(:track_with_sound)
-
-    visit track_path(track)
-
-    expect(page).to have_xpath "//audio[@src='#{sound_path track.sound}']"
-    visit find('audio')[:src]
-  end
 end
diff --git a/spec/features/tracks/player_spec.rb b/spec/features/tracks/player_spec.rb
new file mode 100644
index 0000000..f57efc7
--- /dev/null
+++ b/spec/features/tracks/player_spec.rb
@@ -0,0 +1,14 @@
+feature 'Tracks player' do
+  include UserIntegrationHelpers
+
+  background { sign_in }
+
+  scenario 'includes a player in track page' do
+    track = FactoryGirl.create(:track_with_sound)
+
+    visit track_path(track)
+
+    expect(page).to have_xpath "//audio[@src='#{sound_path track.sound}']"
+    visit find('audio')[:src]
+  end
+end