diff --git a/test/incoming_test_emails/gmail/filtered_comment.txt b/test/fixtures/incoming_test_emails/gmail/filtered_comment.txt
similarity index 100%
rename from test/incoming_test_emails/gmail/filtered_comment.txt
rename to test/fixtures/incoming_test_emails/gmail/filtered_comment.txt
diff --git a/test/incoming_test_emails/gmail/final_parsed_comment.txt b/test/fixtures/incoming_test_emails/gmail/final_parsed_comment.txt
similarity index 100%
rename from test/incoming_test_emails/gmail/final_parsed_comment.txt
rename to test/fixtures/incoming_test_emails/gmail/final_parsed_comment.txt
diff --git a/test/incoming_test_emails/gmail/incoming_gmail_email.eml b/test/fixtures/incoming_test_emails/gmail/incoming_gmail_email.eml
similarity index 100%
rename from test/incoming_test_emails/gmail/incoming_gmail_email.eml
rename to test/fixtures/incoming_test_emails/gmail/incoming_gmail_email.eml
diff --git a/test/incoming_test_emails/gmail/incoming_gmail_email.html b/test/fixtures/incoming_test_emails/gmail/incoming_gmail_email.html
similarity index 100%
rename from test/incoming_test_emails/gmail/incoming_gmail_email.html
rename to test/fixtures/incoming_test_emails/gmail/incoming_gmail_email.html
diff --git a/test/incoming_test_emails/gmail/readme.md b/test/fixtures/incoming_test_emails/gmail/readme.md
similarity index 100%
rename from test/incoming_test_emails/gmail/readme.md
rename to test/fixtures/incoming_test_emails/gmail/readme.md
diff --git a/test/incoming_test_emails/gmail/trimmed_content.txt b/test/fixtures/incoming_test_emails/gmail/trimmed_content.txt
similarity index 100%
rename from test/incoming_test_emails/gmail/trimmed_content.txt
rename to test/fixtures/incoming_test_emails/gmail/trimmed_content.txt
diff --git a/test/incoming_test_emails/yahoo/final_parsed_comment.txt b/test/fixtures/incoming_test_emails/yahoo/final_parsed_comment.txt
similarity index 100%
rename from test/incoming_test_emails/yahoo/final_parsed_comment.txt
rename to test/fixtures/incoming_test_emails/yahoo/final_parsed_comment.txt
diff --git a/test/incoming_test_emails/yahoo/incoming_yahoo_email.eml b/test/fixtures/incoming_test_emails/yahoo/incoming_yahoo_email.eml
similarity index 100%
rename from test/incoming_test_emails/yahoo/incoming_yahoo_email.eml
rename to test/fixtures/incoming_test_emails/yahoo/incoming_yahoo_email.eml
diff --git a/test/incoming_test_emails/yahoo/incoming_yahoo_mail.html b/test/fixtures/incoming_test_emails/yahoo/incoming_yahoo_mail.html
similarity index 100%
rename from test/incoming_test_emails/yahoo/incoming_yahoo_mail.html
rename to test/fixtures/incoming_test_emails/yahoo/incoming_yahoo_mail.html
diff --git a/test/incoming_test_emails/yahoo/readme.md b/test/fixtures/incoming_test_emails/yahoo/readme.md
similarity index 100%
rename from test/incoming_test_emails/yahoo/readme.md
rename to test/fixtures/incoming_test_emails/yahoo/readme.md
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 585aa32ba8..132c511e8e 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -225,11 +225,11 @@ class CommentTest < ActiveSupport::TestCase
 
   test 'should parse incoming mail from gmail service correctly and add comment' do
     require 'mail'
-    mail = Mail.read('test/incoming_test_emails/gmail/incoming_gmail_email.eml')
+    mail = Mail.read('fixtures/incoming_test_emails/gmail/incoming_gmail_email.eml')
     node = Node.last
     mail.subject = "Re: #{node.title} (##{node.nid})"
     Comment.receive_mail(mail)
-    f = File.open('test/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
     comment = Comment.last
     user_email = mail.from.first
     assert_equal comment.comment, f.read
@@ -242,11 +242,11 @@ class CommentTest < ActiveSupport::TestCase
 
   test 'should parse incoming mail from yahoo service correctly and add comment' do
     require 'mail'
-    mail = Mail.read('test/incoming_test_emails/yahoo/incoming_yahoo_email.eml')
+    mail = Mail.read('fixtures/incoming_test_emails/yahoo/incoming_yahoo_email.eml')
     node = Node.last
     mail.subject = "Re: #{node.title} (##{node.nid})"
     Comment.receive_mail(mail)
-    f = File.open('test/incoming_test_emails/yahoo/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/yahoo/final_parsed_comment.txt', 'r')
     comment = Comment.last
     user_email = mail.from.first
     assert_equal comment.comment, f.read
@@ -259,11 +259,11 @@ class CommentTest < ActiveSupport::TestCase
 
   test 'should parse incoming mail from gmail service correctly and add answer comment' do
     require 'mail'
-    mail = Mail.read('test/incoming_test_emails/gmail/incoming_gmail_email.eml')
+    mail = Mail.read('fixtures/incoming_test_emails/gmail/incoming_gmail_email.eml')
     answer = Answer.last
     mail.subject = "Re: (#a#{answer.id})"
     Comment.receive_mail(mail)
-    f = File.open('test/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
     comment = Comment.last
     user_email = mail.from.first
     assert_equal comment.comment, f.read
@@ -276,12 +276,12 @@ class CommentTest < ActiveSupport::TestCase
 
   test 'should parse incoming mail from yahoo service correctly and add answer comment' do
     require 'mail'
-    mail = Mail.read('test/incoming_test_emails/yahoo/incoming_yahoo_email.eml')
+    mail = Mail.read('fixtures/incoming_test_emails/yahoo/incoming_yahoo_email.eml')
     # Mail contain ["01namangupta@gmail.com"] in from field.
     answer = Answer.last
     mail.subject = "Re: (#a#{answer.id})"
     Comment.receive_mail(mail)
-    f = File.open('test/incoming_test_emails/yahoo/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/yahoo/final_parsed_comment.txt', 'r')
     comment = Comment.last
     user_email = mail.from.first
     assert_equal comment.comment, f.read
@@ -304,7 +304,7 @@ class CommentTest < ActiveSupport::TestCase
 
   test 'should be true when there is trimmed content in comment' do
     comment = Comment.new
-    f = File.open('test/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
     comment.comment = f.read
     f.close()
     comment.save
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 47f54d382b..bdeb1a8668 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -3,25 +3,25 @@
 class ApplicationHelperTest < ActionView::TestCase
 
   test 'should give filtered comment body' do
-    f = File.open('test/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
     filtered_body = filtered_comment_body(f.read)
     f.close()
-    f = File.open('test/incoming_test_emails/gmail/filtered_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/filtered_comment.txt', 'r')
     assert_equal filtered_body, f.read
     f.close()
   end
 
   test 'should give trimmed content of comment' do
-    f = File.open('test/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
     trimmed_content = trimmed_body(f.read)
     f.close()
-    f = File.open('test/incoming_test_emails/gmail/trimmed_content.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/trimmed_content.txt', 'r')
     assert_equal trimmed_content, f.read
     f.close()
   end
 
   test 'should return true if contain trimmed content' do
-    f = File.open('test/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
+    f = File.open('fixtures/incoming_test_emails/gmail/final_parsed_comment.txt', 'r')
     contain_trimmed_body = contain_trimmed_body?(f.read)
     assert_equal contain_trimmed_body, true
     f.close()