5 files changed, 10 insertions, 10 deletions
diff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp
index e11f6b78..31528000 100644
--- a/test/media_device/media_device_link_test.cpp
+++ b/test/media_device/media_device_link_test.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * media_device_link_test.cpp - Tests link handling on VIMC media device
+ * Tests link handling on VIMC media device
  */
 
 #include <iostream>
diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp
index cdec5b8d..63aeed48 100644
--- a/test/media_device/media_device_print_test.cpp
+++ b/test/media_device/media_device_print_test.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2018-2019, Google Inc.
  *
- * media_device_print_test.cpp - Print out media devices
+ * Print out media devices
  */
 
 #include <iostream>
diff --git a/test/media_device/media_device_test.cpp b/test/media_device/media_device_test.cpp
index 1397d123..3e41d0f0 100644
--- a/test/media_device/media_device_test.cpp
+++ b/test/media_device/media_device_test.cpp
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * media_device_test.cpp - libcamera media device test base class
+ * libcamera media device test base class
  */
 
 #include <iostream>
diff --git a/test/media_device/media_device_test.h b/test/media_device/media_device_test.h
index 9b226f1a..5223b760 100644
--- a/test/media_device/media_device_test.h
+++ b/test/media_device/media_device_test.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2019, Google Inc.
  *
- * media_device_test.h - libcamera media device test base class
+ * libcamera media device test base class
  */
 
 #pragma once
diff --git a/test/media_device/meson.build b/test/media_device/meson.build
index 83dfe8f1..84966c97 100644
--- a/test/media_device/meson.build
+++ b/test/media_device/meson.build
@@ -5,20 +5,20 @@ lib_mdev_test_sources = files([
 ])
 
 media_device_tests = [
-    ['media_device_acquire',            'media_device_acquire.cpp'],
-    ['media_device_print_test',         'media_device_print_test.cpp'],
-    ['media_device_link_test',          'media_device_link_test.cpp'],
+    {'name': 'media_device_acquire', 'sources': ['media_device_acquire.cpp']},
+    {'name': 'media_device_print_test', 'sources': ['media_device_print_test.cpp']},
+    {'name': 'media_device_link_test', 'sources': ['media_device_link_test.cpp']},
 ]
 
 lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources,
                                dependencies : libcamera_private,
                                include_directories : test_includes_internal)
 
-foreach t : media_device_tests
-    exe = executable(t[0], t[1],
+foreach test : media_device_tests
+    exe = executable(test['name'], test['sources'],
                      dependencies : libcamera_private,
                      link_with : [test_libraries, lib_mdev_test],
                      include_directories : test_includes_internal)
 
-    test(t[0], exe, suite : 'media_device', is_parallel : false)
+    test(test['name'], exe, suite : 'media_device', is_parallel : false)
 endforeach