diff --git a/plugins/parsers/avro/parser_test.go b/plugins/parsers/avro/parser_test.go
index 6ab43f2bbc21a..43c44ac8ccbf9 100644
--- a/plugins/parsers/avro/parser_test.go
+++ b/plugins/parsers/avro/parser_test.go
@@ -17,8 +17,8 @@ import (
 )
 
 func TestCases(t *testing.T) {
-	// Get all directories in testdata
-	folders, err := os.ReadDir("testdata")
+	// Get all test-case directories
+	folders, err := os.ReadDir("testcases")
 	require.NoError(t, err)
 	// Make sure testdata contains data
 	require.NotEmpty(t, folders)
@@ -30,7 +30,7 @@ func TestCases(t *testing.T) {
 
 	for _, f := range folders {
 		fname := f.Name()
-		testdataPath := filepath.Join("testdata", fname)
+		testdataPath := filepath.Join("testcases", fname)
 		configFilename := filepath.Join(testdataPath, "telegraf.conf")
 		expectedFilename := filepath.Join(testdataPath, "expected.out")
 		expectedErrorFilename := filepath.Join(testdataPath, "expected.err")
@@ -110,7 +110,7 @@ func BenchmarkParsing(b *testing.B) {
 	}
 	require.NoError(b, plugin.Init())
 
-	benchmarkData, err := os.ReadFile(filepath.Join("testdata", "benchmark", "message.json"))
+	benchmarkData, err := os.ReadFile(filepath.Join("testcases", "benchmark", "message.json"))
 	require.NoError(b, err)
 
 	b.ResetTimer()
@@ -131,7 +131,7 @@ func TestBenchmarkDataBinary(t *testing.T) {
 	}
 	require.NoError(t, plugin.Init())
 
-	benchmarkDir := filepath.Join("testdata", "benchmark")
+	benchmarkDir := filepath.Join("testcases", "benchmark")
 
 	// Read the expected valued from file
 	parser := &influx.Parser{}
@@ -167,7 +167,7 @@ func BenchmarkParsingBinary(b *testing.B) {
 	require.NoError(b, plugin.Init())
 
 	// Re-encode the benchmark data from JSON to binary format
-	jsonData, err := os.ReadFile(filepath.Join("testdata", "benchmark", "message.json"))
+	jsonData, err := os.ReadFile(filepath.Join("testcases", "benchmark", "message.json"))
 	require.NoError(b, err)
 	codec, err := goavro.NewCodec(benchmarkSchema)
 	require.NoError(b, err)
diff --git a/plugins/parsers/avro/testdata/bad-timestamp-format/expected.err b/plugins/parsers/avro/testcases/bad-timestamp-format/expected.err
similarity index 100%
rename from plugins/parsers/avro/testdata/bad-timestamp-format/expected.err
rename to plugins/parsers/avro/testcases/bad-timestamp-format/expected.err
diff --git a/plugins/parsers/avro/testdata/bad-timestamp-format/expected.out b/plugins/parsers/avro/testcases/bad-timestamp-format/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/bad-timestamp-format/expected.out
rename to plugins/parsers/avro/testcases/bad-timestamp-format/expected.out
diff --git a/plugins/parsers/avro/testdata/bad-timestamp-format/message.avro b/plugins/parsers/avro/testcases/bad-timestamp-format/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/bad-timestamp-format/message.avro
rename to plugins/parsers/avro/testcases/bad-timestamp-format/message.avro
diff --git a/plugins/parsers/avro/testdata/bad-timestamp-format/telegraf.conf b/plugins/parsers/avro/testcases/bad-timestamp-format/telegraf.conf
similarity index 87%
rename from plugins/parsers/avro/testdata/bad-timestamp-format/telegraf.conf
rename to plugins/parsers/avro/testcases/bad-timestamp-format/telegraf.conf
index b4a89fad7095b..07297864fd38e 100644
--- a/plugins/parsers/avro/testdata/bad-timestamp-format/telegraf.conf
+++ b/plugins/parsers/avro/testcases/bad-timestamp-format/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/bad-timestamp-format/message.avro"]
+  files = ["./testcases/bad-timestamp-format/message.avro"]
   data_format = "avro"
 
   avro_measurement = "measurement"
@@ -26,4 +26,4 @@
       }
   ]
 }
-'''	
+'''
diff --git a/plugins/parsers/avro/testdata/benchmark/expected.out b/plugins/parsers/avro/testcases/benchmark/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/benchmark/expected.out
rename to plugins/parsers/avro/testcases/benchmark/expected.out
diff --git a/plugins/parsers/avro/testdata/benchmark/message.json b/plugins/parsers/avro/testcases/benchmark/message.json
similarity index 100%
rename from plugins/parsers/avro/testdata/benchmark/message.json
rename to plugins/parsers/avro/testcases/benchmark/message.json
diff --git a/plugins/parsers/avro/testdata/benchmark/telegraf.conf b/plugins/parsers/avro/testcases/benchmark/telegraf.conf
similarity index 94%
rename from plugins/parsers/avro/testdata/benchmark/telegraf.conf
rename to plugins/parsers/avro/testcases/benchmark/telegraf.conf
index c20f7ccc753c9..bc67e9a315dde 100644
--- a/plugins/parsers/avro/testdata/benchmark/telegraf.conf
+++ b/plugins/parsers/avro/testcases/benchmark/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/benchmark/message.json"]
+  files = ["./testcases/benchmark/message.json"]
   data_format = "avro"
 
   avro_format = "json"
diff --git a/plugins/parsers/avro/testdata/config-both/expected.err b/plugins/parsers/avro/testcases/config-both/expected.err
similarity index 100%
rename from plugins/parsers/avro/testdata/config-both/expected.err
rename to plugins/parsers/avro/testcases/config-both/expected.err
diff --git a/plugins/parsers/avro/testdata/config-both/expected.out b/plugins/parsers/avro/testcases/config-both/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/config-both/expected.out
rename to plugins/parsers/avro/testcases/config-both/expected.out
diff --git a/plugins/parsers/avro/testdata/config-both/message.avro b/plugins/parsers/avro/testcases/config-both/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/config-both/message.avro
rename to plugins/parsers/avro/testcases/config-both/message.avro
diff --git a/plugins/parsers/avro/testdata/config-both/telegraf.conf b/plugins/parsers/avro/testcases/config-both/telegraf.conf
similarity index 88%
rename from plugins/parsers/avro/testdata/config-both/telegraf.conf
rename to plugins/parsers/avro/testcases/config-both/telegraf.conf
index 61cba90f22369..fb6bb5eb2dbb1 100644
--- a/plugins/parsers/avro/testdata/config-both/telegraf.conf
+++ b/plugins/parsers/avro/testcases/config-both/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/config-both/message.avro"]
+  files = ["./testcases/config-both/message.avro"]
   data_format = "avro"
 
   avro_measurement = "measurement"
@@ -25,4 +25,4 @@
       }
   ]
 }
-'''	
+'''
diff --git a/plugins/parsers/avro/testdata/config-neither/expected.err b/plugins/parsers/avro/testcases/config-neither/expected.err
similarity index 100%
rename from plugins/parsers/avro/testdata/config-neither/expected.err
rename to plugins/parsers/avro/testcases/config-neither/expected.err
diff --git a/plugins/parsers/avro/testdata/config-neither/expected.out b/plugins/parsers/avro/testcases/config-neither/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/config-neither/expected.out
rename to plugins/parsers/avro/testcases/config-neither/expected.out
diff --git a/plugins/parsers/avro/testdata/config-neither/message.avro b/plugins/parsers/avro/testcases/config-neither/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/config-neither/message.avro
rename to plugins/parsers/avro/testcases/config-neither/message.avro
diff --git a/plugins/parsers/avro/testdata/config-neither/telegraf.conf b/plugins/parsers/avro/testcases/config-neither/telegraf.conf
similarity index 64%
rename from plugins/parsers/avro/testdata/config-neither/telegraf.conf
rename to plugins/parsers/avro/testcases/config-neither/telegraf.conf
index e52128df66d46..14adc8197ac2a 100644
--- a/plugins/parsers/avro/testdata/config-neither/telegraf.conf
+++ b/plugins/parsers/avro/testcases/config-neither/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/config-neither/message.avro"]
+  files = ["./testcases/config-neither/message.avro"]
   data_format = "avro"
   avro_measurement = "measurement"
   avro_tags = [ "tag" ]
diff --git a/plugins/parsers/avro/testcases/enum/expected.out b/plugins/parsers/avro/testcases/enum/expected.out
new file mode 100644
index 0000000000000..15565a38cfdcf
--- /dev/null
+++ b/plugins/parsers/avro/testcases/enum/expected.out
@@ -0,0 +1 @@
+sensors,name=temperature value_int=42i,status="OK"
diff --git a/plugins/parsers/avro/testcases/enum/message.json b/plugins/parsers/avro/testcases/enum/message.json
new file mode 100644
index 0000000000000..6d4f89a71540d
--- /dev/null
+++ b/plugins/parsers/avro/testcases/enum/message.json
@@ -0,0 +1,7 @@
+{
+    "name": "temperature",
+    "value": {
+        "int": 42
+    },
+    "status": "OK"
+}
\ No newline at end of file
diff --git a/plugins/parsers/avro/testcases/enum/telegraf.conf b/plugins/parsers/avro/testcases/enum/telegraf.conf
new file mode 100644
index 0000000000000..bcaa95c383d67
--- /dev/null
+++ b/plugins/parsers/avro/testcases/enum/telegraf.conf
@@ -0,0 +1,41 @@
+[[ inputs.file ]]
+  files = ["./testcases/enum/message.json"]
+  data_format = "avro"
+
+  avro_format = "json"
+  avro_measurement = "sensors"
+  avro_tags = ["name"]
+  avro_fields = ["value", "status"]
+  avro_field_separator = "_"
+  avro_schema = '''
+    {
+        "type": "record",
+        "name": "Metric",
+        "fields": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "value",
+                "type": [
+                    "null",
+                    "int",
+                    "string"
+                ]
+            },
+            {
+                "name": "status",
+                "type": {
+                    "type": "enum",
+                    "name": "Status",
+                    "symbols": [
+                        "UNKNOWN",
+                        "OK",
+                        "FAILURE"
+                    ]
+                }
+            }
+        ]
+    }
+  '''
diff --git a/plugins/parsers/avro/testdata/json-array/expected.out b/plugins/parsers/avro/testcases/json-array/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/json-array/expected.out
rename to plugins/parsers/avro/testcases/json-array/expected.out
diff --git a/plugins/parsers/avro/testdata/json-array/message.json b/plugins/parsers/avro/testcases/json-array/message.json
similarity index 100%
rename from plugins/parsers/avro/testdata/json-array/message.json
rename to plugins/parsers/avro/testcases/json-array/message.json
diff --git a/plugins/parsers/avro/testdata/json-array/telegraf.conf b/plugins/parsers/avro/testcases/json-array/telegraf.conf
similarity index 93%
rename from plugins/parsers/avro/testdata/json-array/telegraf.conf
rename to plugins/parsers/avro/testcases/json-array/telegraf.conf
index 1133f3849f343..a7031ef8c1616 100644
--- a/plugins/parsers/avro/testdata/json-array/telegraf.conf
+++ b/plugins/parsers/avro/testcases/json-array/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/json-array/message.json"]
+  files = ["./testcases/json-array/message.json"]
   data_format = "avro"
 
   avro_format = "json"
diff --git a/plugins/parsers/avro/testdata/json-format/expected.out b/plugins/parsers/avro/testcases/json-format/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/json-format/expected.out
rename to plugins/parsers/avro/testcases/json-format/expected.out
diff --git a/plugins/parsers/avro/testdata/json-format/message.json b/plugins/parsers/avro/testcases/json-format/message.json
similarity index 100%
rename from plugins/parsers/avro/testdata/json-format/message.json
rename to plugins/parsers/avro/testcases/json-format/message.json
diff --git a/plugins/parsers/avro/testdata/json-format/telegraf.conf b/plugins/parsers/avro/testcases/json-format/telegraf.conf
similarity index 95%
rename from plugins/parsers/avro/testdata/json-format/telegraf.conf
rename to plugins/parsers/avro/testcases/json-format/telegraf.conf
index e2238f673f020..0eea8f8fc66df 100644
--- a/plugins/parsers/avro/testdata/json-format/telegraf.conf
+++ b/plugins/parsers/avro/testcases/json-format/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/json-format/message.json"]
+  files = ["./testcases/json-format/message.json"]
   data_format = "avro"
 
   avro_format = "json"
diff --git a/plugins/parsers/avro/testdata/measurement_name_from_message/expected.out b/plugins/parsers/avro/testcases/measurement_name_from_message/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/measurement_name_from_message/expected.out
rename to plugins/parsers/avro/testcases/measurement_name_from_message/expected.out
diff --git a/plugins/parsers/avro/testdata/measurement_name_from_message/message.avro b/plugins/parsers/avro/testcases/measurement_name_from_message/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/measurement_name_from_message/message.avro
rename to plugins/parsers/avro/testcases/measurement_name_from_message/message.avro
diff --git a/plugins/parsers/avro/testdata/measurement_name_from_message/telegraf.conf b/plugins/parsers/avro/testcases/measurement_name_from_message/telegraf.conf
similarity index 86%
rename from plugins/parsers/avro/testdata/measurement_name_from_message/telegraf.conf
rename to plugins/parsers/avro/testcases/measurement_name_from_message/telegraf.conf
index 4b7083ff8281d..97ece814c6ea3 100644
--- a/plugins/parsers/avro/testdata/measurement_name_from_message/telegraf.conf
+++ b/plugins/parsers/avro/testcases/measurement_name_from_message/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/measurement_name_from_message/message.avro"]
+  files = ["./testcases/measurement_name_from_message/message.avro"]
   data_format = "avro"
   avro_measurement_field = "Measurement"
   avro_tags = [ "Server" ]
@@ -27,4 +27,4 @@
     }
   ]
 }
-'''	
+'''
diff --git a/plugins/parsers/avro/testdata/no-timestamp-format/expected.out b/plugins/parsers/avro/testcases/no-timestamp-format/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/no-timestamp-format/expected.out
rename to plugins/parsers/avro/testcases/no-timestamp-format/expected.out
diff --git a/plugins/parsers/avro/testdata/no-timestamp-format/message.avro b/plugins/parsers/avro/testcases/no-timestamp-format/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/no-timestamp-format/message.avro
rename to plugins/parsers/avro/testcases/no-timestamp-format/message.avro
diff --git a/plugins/parsers/avro/testdata/no-timestamp-format/telegraf.conf b/plugins/parsers/avro/testcases/no-timestamp-format/telegraf.conf
similarity index 86%
rename from plugins/parsers/avro/testdata/no-timestamp-format/telegraf.conf
rename to plugins/parsers/avro/testcases/no-timestamp-format/telegraf.conf
index a5d21090fa78d..c2f5d685857f3 100644
--- a/plugins/parsers/avro/testdata/no-timestamp-format/telegraf.conf
+++ b/plugins/parsers/avro/testcases/no-timestamp-format/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/no-timestamp-format/message.avro"]
+  files = ["./testcases/no-timestamp-format/message.avro"]
   data_format = "avro"
 
   avro_measurement = "measurement"
@@ -25,4 +25,4 @@
       }
   ]
 }
-'''	
+'''
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp/expected.out b/plugins/parsers/avro/testcases/supplied_timestamp/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/supplied_timestamp/expected.out
rename to plugins/parsers/avro/testcases/supplied_timestamp/expected.out
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp/message.avro b/plugins/parsers/avro/testcases/supplied_timestamp/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/supplied_timestamp/message.avro
rename to plugins/parsers/avro/testcases/supplied_timestamp/message.avro
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp/telegraf.conf b/plugins/parsers/avro/testcases/supplied_timestamp/telegraf.conf
similarity index 87%
rename from plugins/parsers/avro/testdata/supplied_timestamp/telegraf.conf
rename to plugins/parsers/avro/testcases/supplied_timestamp/telegraf.conf
index ee711eae3cd0e..f3eef5f38a7e1 100644
--- a/plugins/parsers/avro/testdata/supplied_timestamp/telegraf.conf
+++ b/plugins/parsers/avro/testcases/supplied_timestamp/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/supplied_timestamp/message.avro"]
+  files = ["./testcases/supplied_timestamp/message.avro"]
   data_format = "avro"
   avro_measurement = "measurement"
   avro_tags = [ "tag" ]
@@ -25,4 +25,4 @@
       }
   ]
 }
-'''	
+'''
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_specified/expected.out b/plugins/parsers/avro/testcases/supplied_timestamp_fields_specified/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/supplied_timestamp_fields_specified/expected.out
rename to plugins/parsers/avro/testcases/supplied_timestamp_fields_specified/expected.out
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_specified/message.avro b/plugins/parsers/avro/testcases/supplied_timestamp_fields_specified/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/supplied_timestamp_fields_specified/message.avro
rename to plugins/parsers/avro/testcases/supplied_timestamp_fields_specified/message.avro
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_specified/telegraf.conf b/plugins/parsers/avro/testcases/supplied_timestamp_fields_specified/telegraf.conf
similarity index 85%
rename from plugins/parsers/avro/testdata/supplied_timestamp_fields_specified/telegraf.conf
rename to plugins/parsers/avro/testcases/supplied_timestamp_fields_specified/telegraf.conf
index 9ae72b5308cb2..79f29b5a4b802 100644
--- a/plugins/parsers/avro/testdata/supplied_timestamp_fields_specified/telegraf.conf
+++ b/plugins/parsers/avro/testcases/supplied_timestamp_fields_specified/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/supplied_timestamp_fields_specified/message.avro"]
+  files = ["./testcases/supplied_timestamp_fields_specified/message.avro"]
   data_format = "avro"
   avro_measurement = "measurement"
   avro_tags = [ "tag" ]
@@ -26,4 +26,4 @@
       }
   ]
 }
-'''	
+'''
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/expected.out b/plugins/parsers/avro/testcases/supplied_timestamp_fields_unspecified/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/expected.out
rename to plugins/parsers/avro/testcases/supplied_timestamp_fields_unspecified/expected.out
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/message.avro b/plugins/parsers/avro/testcases/supplied_timestamp_fields_unspecified/message.avro
similarity index 100%
rename from plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/message.avro
rename to plugins/parsers/avro/testcases/supplied_timestamp_fields_unspecified/message.avro
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/telegraf.conf b/plugins/parsers/avro/testcases/supplied_timestamp_fields_unspecified/telegraf.conf
similarity index 80%
rename from plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/telegraf.conf
rename to plugins/parsers/avro/testcases/supplied_timestamp_fields_unspecified/telegraf.conf
index d5c58355ebd92..925573f4f4fbe 100644
--- a/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/telegraf.conf
+++ b/plugins/parsers/avro/testcases/supplied_timestamp_fields_unspecified/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/supplied_timestamp_fields_unspecified/message.avro"]
+  files = ["./testcases/supplied_timestamp_fields_unspecified/message.avro"]
   data_format = "avro"
   avro_measurement = "measurement"
   avro_tags = [ "tag" ]
@@ -20,4 +20,4 @@
       }
   ]
 }
-'''	
+'''
diff --git a/plugins/parsers/avro/testdata/union-any/expected.out b/plugins/parsers/avro/testcases/union-any/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/union-any/expected.out
rename to plugins/parsers/avro/testcases/union-any/expected.out
diff --git a/plugins/parsers/avro/testdata/union-any/message.json b/plugins/parsers/avro/testcases/union-any/message.json
similarity index 100%
rename from plugins/parsers/avro/testdata/union-any/message.json
rename to plugins/parsers/avro/testcases/union-any/message.json
diff --git a/plugins/parsers/avro/testdata/union-any/telegraf.conf b/plugins/parsers/avro/testcases/union-any/telegraf.conf
similarity index 96%
rename from plugins/parsers/avro/testdata/union-any/telegraf.conf
rename to plugins/parsers/avro/testcases/union-any/telegraf.conf
index e4966aee82c6b..1cea915bafe78 100644
--- a/plugins/parsers/avro/testdata/union-any/telegraf.conf
+++ b/plugins/parsers/avro/testcases/union-any/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/union-any/message.json"]
+  files = ["./testcases/union-any/message.json"]
   data_format = "avro"
 
   avro_format = "json"
diff --git a/plugins/parsers/avro/testdata/union-array/expected.out b/plugins/parsers/avro/testcases/union-array/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/union-array/expected.out
rename to plugins/parsers/avro/testcases/union-array/expected.out
diff --git a/plugins/parsers/avro/testdata/union-array/message.json b/plugins/parsers/avro/testcases/union-array/message.json
similarity index 100%
rename from plugins/parsers/avro/testdata/union-array/message.json
rename to plugins/parsers/avro/testcases/union-array/message.json
diff --git a/plugins/parsers/avro/testdata/union-array/telegraf.conf b/plugins/parsers/avro/testcases/union-array/telegraf.conf
similarity index 93%
rename from plugins/parsers/avro/testdata/union-array/telegraf.conf
rename to plugins/parsers/avro/testcases/union-array/telegraf.conf
index 75ef5cb40de20..f0aa5546f735c 100644
--- a/plugins/parsers/avro/testdata/union-array/telegraf.conf
+++ b/plugins/parsers/avro/testcases/union-array/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/union-array/message.json"]
+  files = ["./testcases/union-array/message.json"]
   data_format = "avro"
 
   avro_format = "json"
diff --git a/plugins/parsers/avro/testdata/union-nullable/expected.out b/plugins/parsers/avro/testcases/union-nullable/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/union-nullable/expected.out
rename to plugins/parsers/avro/testcases/union-nullable/expected.out
diff --git a/plugins/parsers/avro/testdata/union-nullable/message.json b/plugins/parsers/avro/testcases/union-nullable/message.json
similarity index 100%
rename from plugins/parsers/avro/testdata/union-nullable/message.json
rename to plugins/parsers/avro/testcases/union-nullable/message.json
diff --git a/plugins/parsers/avro/testdata/union-nullable/telegraf.conf b/plugins/parsers/avro/testcases/union-nullable/telegraf.conf
similarity index 95%
rename from plugins/parsers/avro/testdata/union-nullable/telegraf.conf
rename to plugins/parsers/avro/testcases/union-nullable/telegraf.conf
index a03a7e5dc8c59..790e8d676e5b4 100644
--- a/plugins/parsers/avro/testdata/union-nullable/telegraf.conf
+++ b/plugins/parsers/avro/testcases/union-nullable/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/union-nullable/message.json"]
+  files = ["./testcases/union-nullable/message.json"]
   data_format = "avro"
 
   avro_format = "json"
diff --git a/plugins/parsers/avro/testdata/union/expected.out b/plugins/parsers/avro/testcases/union/expected.out
similarity index 100%
rename from plugins/parsers/avro/testdata/union/expected.out
rename to plugins/parsers/avro/testcases/union/expected.out
diff --git a/plugins/parsers/avro/testdata/union/message.json b/plugins/parsers/avro/testcases/union/message.json
similarity index 100%
rename from plugins/parsers/avro/testdata/union/message.json
rename to plugins/parsers/avro/testcases/union/message.json
diff --git a/plugins/parsers/avro/testdata/union/telegraf.conf b/plugins/parsers/avro/testcases/union/telegraf.conf
similarity index 96%
rename from plugins/parsers/avro/testdata/union/telegraf.conf
rename to plugins/parsers/avro/testcases/union/telegraf.conf
index dad3fb0a2045c..9783ec4f6371e 100644
--- a/plugins/parsers/avro/testdata/union/telegraf.conf
+++ b/plugins/parsers/avro/testcases/union/telegraf.conf
@@ -1,5 +1,5 @@
 [[ inputs.file ]]
-  files = ["./testdata/union/message.json"]
+  files = ["./testcases/union/message.json"]
   data_format = "avro"
 
   avro_format = "json"