diff --git a/test/meson.build b/test/meson.build
index d740b44..863c047 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -3,20 +3,21 @@
 gmock_dep = dependency('gmock', disabler: true, required: false)
 if not gtest_dep.found() or not gmock_dep.found()
     cmake = import('cmake')
-    gtest_proj = cmake.subproject('googletest',
-                                  required: false)
+    gtest_proj = cmake.subproject('googletest', required: false)
     if gtest_proj.found()
         gtest_dep = declare_dependency(
             dependencies: [
                 dependency('threads'),
                 gtest_proj.dependency('gtest'),
                 gtest_proj.dependency('gtest_main'),
-            ]
+            ],
         )
         gmock_dep = gtest_proj.dependency('gmock')
     else
-        assert(not get_option('tests').allowed(),
-               'Googletest is required if tests are enabled')
+        assert(
+            not get_option('tests').allowed(),
+            'Googletest is required if tests are enabled',
+        )
     endif
 endif
 
@@ -24,8 +25,7 @@
 subdir('simulator')
 
 # supporting files that need compiled/linked
-test_src = ['../src/util/hei_bit_string.cpp',
-            'sim_tracing.cpp']
+test_src = ['../src/util/hei_bit_string.cpp', 'sim_tracing.cpp']
 
 # build g-test framework unit tests
 gtests = [
@@ -36,8 +36,15 @@
 ]
 
 foreach g : gtests
-  test(g, executable(g.underscorify(), g + '.cpp', test_src,
-                     dependencies : gtest_dep,
-                     include_directories : incdir))
+    test(
+        g,
+        executable(
+            g.underscorify(),
+            g + '.cpp',
+            test_src,
+            dependencies: gtest_dep,
+            include_directories: incdir,
+        ),
+    )
 endforeach
 
diff --git a/test/simulator/meson.build b/test/simulator/meson.build
index 87b2d80..1ce47e7 100644
--- a/test/simulator/meson.build
+++ b/test/simulator/meson.build
@@ -1,15 +1,17 @@
 # Simulator sources
-sim_src = files(
-    'simulator.cpp',
-    'sim_hardware_access.cpp',
-    '../sim_tracing.cpp'
-)
+sim_src = files('../sim_tracing.cpp', 'sim_hardware_access.cpp', 'simulator.cpp')
 
 subdir('testcases')
 
 # Build simulator linked locally
-test('simulator',
-     executable('simulator', sim_src, test_src,
-                dependencies : gtest_dep,
-                link_with : libhei_static,
-                include_directories: [ incdir, '.' ]))
+test(
+    'simulator',
+    executable(
+        'simulator',
+        sim_src,
+        test_src,
+        dependencies: gtest_dep,
+        link_with: libhei_static,
+        include_directories: [incdir, '.'],
+    ),
+)
diff --git a/test/simulator/testcases/meson.build b/test/simulator/testcases/meson.build
index 0e894cd..0725292 100644
--- a/test/simulator/testcases/meson.build
+++ b/test/simulator/testcases/meson.build
@@ -1,11 +1,11 @@
 # Test cases
 test_src = files(
-    'sample_test_case.cpp',
     'eq_core_fir.cpp',
     'exp20_foxhound7.cpp',
     'exp20_tlx_err_rpt_1.cpp',
-    'omi_dl_fatal.cpp',
-    'tod_fault.cpp',
     'ody_mcbist2.cpp',
+    'omi_dl_fatal.cpp',
+    'sample_test_case.cpp',
+    'tod_fault.cpp',
 )