diff --git a/test/fixtures/posts.yml b/test/fixtures/posts.yml
deleted file mode 100644
index 371889ba..00000000
--- a/test/fixtures/posts.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-google_logo_1:
-  id: 1
-  user_id: 1
-  score: 0
-  source: http://www.google.com/intl/en_ALL/images/logo.gif
-  md5: e80d1c59a673f56078578afb1ac10959
-  last_commented_at: ~
-  rating: q
-  width: 276
-  height: 110
-  last_voter_ip: 127.0.0.1
-  ip_addr: 127.0.0.1
-  cached_tags: x
-  is_note_locked: false
-  fav_count: 0
-  file_ext: jpg
-  last_noted_at: ~
-  is_rating_locked: false
-  parent_id: ~
-  has_children: false
-  status: active
-  sample_width: 276
-  sample_height: 110
-  
-google_logo_2:
-  id: 2
-  user_id: 1
-  score: 0
-  source: http://www.google.com/intl/en_ALL/images/logo.gif
-  md5: e80d1c59a673f560785784fb1ac10957
-  last_commented_at: ~
-  rating: q
-  width: 276
-  height: 110
-  last_voter_ip: 127.0.0.1
-  ip_addr: 127.0.0.1
-  cached_tags: x
-  is_note_locked: false
-  fav_count: 0
-  file_ext: jpg
-  last_noted_at: ~
-  is_rating_locked: false
-  parent_id: ~
-  has_children: false
-  status: active
-  sample_width: 276
-  sample_height: 110
-  
-google_logo_3:
-  id: 3
-  user_id: 1
-  score: 0
-  source: http://www.google.com/intl/en_ALL/images/logo.gif
-  md5: e80d1c59a673f560785784fb1ac10958
-  last_commented_at: ~
-  rating: q
-  width: 276
-  height: 110
-  last_voter_ip: 127.0.0.1
-  ip_addr: 127.0.0.1
-  cached_tags: x
-  is_note_locked: false
-  fav_count: 0
-  file_ext: jpg
-  last_noted_at: ~
-  is_rating_locked: false
-  parent_id: ~
-  has_children: false
-  status: active
-  sample_width: 276
-  sample_height: 110
-
-google_logo_4:
-  id: 4
-  user_id: 1
-  score: 0
-  source: http://www.google.com/intl/en_ALL/images/logo.gif
-  md5: e80d1c59a673f560785784fb1ac10956
-  last_commented_at: ~
-  rating: q
-  width: 276
-  height: 110
-  last_voter_ip: 127.0.0.1
-  ip_addr: 127.0.0.1
-  cached_tags: x
-  is_note_locked: false
-  fav_count: 0
-  file_ext: jpg
-  last_noted_at: ~
-  is_rating_locked: false
-  parent_id: ~
-  has_children: false
-  status: active
-  sample_width: 276
-  sample_height: 110
-
-google_logo_5:
-  id: 5
-  user_id: 1
-  score: 0
-  source: http://www.google.com/intl/en_ALL/images/logo.gif
-  md5: e80d1c59a673f560785784fb1ac10955
-  last_commented_at: ~
-  rating: q
-  width: 276
-  height: 110
-  last_voter_ip: 127.0.0.1
-  ip_addr: 127.0.0.1
-  cached_tags: x
-  is_note_locked: false
-  fav_count: 0
-  file_ext: jpg
-  last_noted_at: ~
-  is_rating_locked: false
-  parent_id: ~
-  has_children: false
-  status: active
-  sample_width: 276
-  sample_height: 110
diff --git a/test/fixtures/table_data.yml b/test/fixtures/table_data.yml
deleted file mode 100644
index 2d4f4c53..00000000
--- a/test/fixtures/table_data.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-posts:
-  name: posts
-  row_count: 5
-
-users:
-  name: users
-  row_count: 5
diff --git a/test/fixtures/favorite_tags.yml b/test/fixtures/tag_subscriptions.yml
similarity index 100%
rename from test/fixtures/favorite_tags.yml
rename to test/fixtures/tag_subscriptions.yml