diff --git a/comment_test.go b/comment_test.go
index e884080..fc99596 100644
--- a/comment_test.go
+++ b/comment_test.go
@@ -42,7 +42,7 @@ func TestCommentService_Submit(t *testing.T) {
 	setup()
 	defer teardown()
 
-	blob, err := readFileContents("testdata/comment-submit-edit.json")
+	blob, err := readFileContents("testdata/comment/submit-or-edit.json")
 	assert.NoError(t, err)
 
 	mux.HandleFunc("/api/comment", func(w http.ResponseWriter, r *http.Request) {
@@ -70,7 +70,7 @@ func TestCommentService_Edit(t *testing.T) {
 	setup()
 	defer teardown()
 
-	blob, err := readFileContents("testdata/comment-submit-edit.json")
+	blob, err := readFileContents("testdata/comment/submit-or-edit.json")
 	assert.NoError(t, err)
 
 	mux.HandleFunc("/api/editusertext", func(w http.ResponseWriter, r *http.Request) {
diff --git a/flair_test.go b/flair_test.go
index 207950d..2a27e16 100644
--- a/flair_test.go
+++ b/flair_test.go
@@ -44,7 +44,7 @@ func TestFlairService_GetFlairs(t *testing.T) {
 	setup()
 	defer teardown()
 
-	blob, err := readFileContents("testdata/flairs.json")
+	blob, err := readFileContents("testdata/flair/flairs.json")
 	assert.NoError(t, err)
 
 	mux.HandleFunc("/r/subreddit/api/user_flair", func(w http.ResponseWriter, r *http.Request) {
@@ -61,7 +61,7 @@ func TestFlairService_GetFlairsV2(t *testing.T) {
 	setup()
 	defer teardown()
 
-	blob, err := readFileContents("testdata/flairs-v2.json")
+	blob, err := readFileContents("testdata/flair/flairs-v2.json")
 	assert.NoError(t, err)
 
 	mux.HandleFunc("/r/subreddit/api/user_flair_v2", func(w http.ResponseWriter, r *http.Request) {
diff --git a/testdata/comment-submit-edit.json b/testdata/comment/submit-or-edit.json
similarity index 100%
rename from testdata/comment-submit-edit.json
rename to testdata/comment/submit-or-edit.json
diff --git a/testdata/flairs-v2.json b/testdata/flair/flairs-v2.json
similarity index 100%
rename from testdata/flairs-v2.json
rename to testdata/flair/flairs-v2.json
diff --git a/testdata/flairs.json b/testdata/flair/flairs.json
similarity index 100%
rename from testdata/flairs.json
rename to testdata/flair/flairs.json