diff --git a/client/runtime_test.go b/client/runtime_test.go
index db4b49df..9f270379 100644
--- a/client/runtime_test.go
+++ b/client/runtime_test.go
@@ -666,7 +666,6 @@ func TestRuntime_ChunkedResponse(t *testing.T) {
 		return nil
 	})
 
-	// specDoc, err := spec.Load("../../fixtures/codegen/todolist.simple.yml")
 	hu, err := url.Parse(server.URL)
 	require.NoError(t, err)
 
diff --git a/middleware/context_test.go b/middleware/context_test.go
index 203daadc..84c412f2 100644
--- a/middleware/context_test.go
+++ b/middleware/context_test.go
@@ -59,7 +59,7 @@ func assertAPIError(t *testing.T, wantCode int, err error) {
 }
 
 func TestContentType_Issue264(t *testing.T) {
-	swspec, err := loads.Spec("../fixtures/bugs/264/swagger.yml")
+	swspec, err := loads.Spec("../testdata/bugs/264/swagger.yml")
 	require.NoError(t, err)
 
 	api := untyped.NewAPI(swspec)
@@ -77,7 +77,7 @@ func TestContentType_Issue264(t *testing.T) {
 }
 
 func TestContentType_Issue172(t *testing.T) {
-	swspec, err := loads.Spec("../fixtures/bugs/172/swagger.yml")
+	swspec, err := loads.Spec("../testdata/bugs/172/swagger.yml")
 	require.NoError(t, err)
 
 	api := untyped.NewAPI(swspec)
@@ -102,7 +102,7 @@ func TestContentType_Issue172(t *testing.T) {
 }
 
 func TestContentType_Issue174(t *testing.T) {
-	swspec, err := loads.Spec("../fixtures/bugs/174/swagger.yml")
+	swspec, err := loads.Spec("../testdata/bugs/174/swagger.yml")
 	require.NoError(t, err)
 
 	api := untyped.NewAPI(swspec)
@@ -482,7 +482,7 @@ func TestContextBindValidRequest(t *testing.T) {
 }
 
 func TestContextBindValidRequest_Issue174(t *testing.T) {
-	spec, err := loads.Spec("../fixtures/bugs/174/swagger.yml")
+	spec, err := loads.Spec("../testdata/bugs/174/swagger.yml")
 	require.NoError(t, err)
 
 	api := untyped.NewAPI(spec)
diff --git a/fixtures/bugs/172/swagger.yml b/testdata/bugs/172/swagger.yml
similarity index 100%
rename from fixtures/bugs/172/swagger.yml
rename to testdata/bugs/172/swagger.yml
diff --git a/fixtures/bugs/174/swagger.yml b/testdata/bugs/174/swagger.yml
similarity index 100%
rename from fixtures/bugs/174/swagger.yml
rename to testdata/bugs/174/swagger.yml
diff --git a/fixtures/bugs/264/swagger.yml b/testdata/bugs/264/swagger.yml
similarity index 100%
rename from fixtures/bugs/264/swagger.yml
rename to testdata/bugs/264/swagger.yml