diff --git a/tests/test_common/ma_test_common.c b/tests/common/common.c
similarity index 100%
rename from tests/test_common/ma_test_common.c
rename to tests/common/common.c
diff --git a/tests/conversion/conversion.c b/tests/conversion/conversion.c
index 5ee8d419..904676f3 100644
--- a/tests/conversion/conversion.c
+++ b/tests/conversion/conversion.c
@@ -1,5 +1,5 @@
 
-#include "../test_common/ma_test_common.c"
+#include "../common/common.c"
 
 ma_result init_data_converter(ma_uint32 rateIn, ma_uint32 rateOut, ma_resample_algorithm algorithm, ma_data_converter* pDataConverter)
 {
diff --git a/tests/deviceio/deviceio.c b/tests/deviceio/deviceio.c
index effc0027..5590abf5 100644
--- a/tests/deviceio/deviceio.c
+++ b/tests/deviceio/deviceio.c
@@ -41,7 +41,7 @@ will receive the captured audio.
 If multiple backends are specified, the priority will be based on the order in which you specify them. If multiple waveform or noise types
 are specified the last one on the command line will have priority.
 */
-#include "../test_common/ma_test_common.c"
+#include "../common/common.c"
 
 #ifndef AUTO_CLOSE_TIME_IN_MILLISECONDS
 #define AUTO_CLOSE_TIME_IN_MILLISECONDS 5000
diff --git a/tests/emscripten/emscripten.c b/tests/emscripten/emscripten.c
index 9cdd0c64..4a5fc1ea 100644
--- a/tests/emscripten/emscripten.c
+++ b/tests/emscripten/emscripten.c
@@ -1,8 +1,7 @@
 #define MA_DEBUG_OUTPUT
 #define MA_NO_DECODING
 #define MA_NO_ENCODING
-#define MINIAUDIO_IMPLEMENTATION
-#include "../../miniaudio.h"
+#include "../../miniaudio.c"
 
 #include <stdio.h>
 
diff --git a/tests/filtering/filtering.c b/tests/filtering/filtering.c
index fb2e3d9c..88732b50 100644
--- a/tests/filtering/filtering.c
+++ b/tests/filtering/filtering.c
@@ -1,4 +1,4 @@
-#include "../test_common/ma_test_common.c"
+#include "../common/common.c"
 
 ma_result filtering_init_decoder_and_encoder(const char* pInputFilePath, const char* pOutputFilePath, ma_format format, ma_uint32 channels, ma_uint32 sampleRate, ma_decoder* pDecoder, ma_encoder* pEncoder)
 {
@@ -24,14 +24,14 @@ ma_result filtering_init_decoder_and_encoder(const char* pInputFilePath, const c
     return MA_SUCCESS;
 }
 
-#include "ma_test_filtering_dithering.c"
-#include "ma_test_filtering_lpf.c"
-#include "ma_test_filtering_hpf.c"
-#include "ma_test_filtering_bpf.c"
-#include "ma_test_filtering_notch.c"
-#include "ma_test_filtering_peak.c"
-#include "ma_test_filtering_loshelf.c"
-#include "ma_test_filtering_hishelf.c"
+#include "filtering_dithering.c"
+#include "filtering_lpf.c"
+#include "filtering_hpf.c"
+#include "filtering_bpf.c"
+#include "filtering_notch.c"
+#include "filtering_peak.c"
+#include "filtering_loshelf.c"
+#include "filtering_hishelf.c"
 
 int main(int argc, char** argv)
 {
diff --git a/tests/filtering/ma_test_filtering_bpf.c b/tests/filtering/filtering_bpf.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_bpf.c
rename to tests/filtering/filtering_bpf.c
diff --git a/tests/filtering/ma_test_filtering_dithering.c b/tests/filtering/filtering_dithering.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_dithering.c
rename to tests/filtering/filtering_dithering.c
diff --git a/tests/filtering/ma_test_filtering_hishelf.c b/tests/filtering/filtering_hishelf.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_hishelf.c
rename to tests/filtering/filtering_hishelf.c
diff --git a/tests/filtering/ma_test_filtering_hpf.c b/tests/filtering/filtering_hpf.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_hpf.c
rename to tests/filtering/filtering_hpf.c
diff --git a/tests/filtering/ma_test_filtering_loshelf.c b/tests/filtering/filtering_loshelf.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_loshelf.c
rename to tests/filtering/filtering_loshelf.c
diff --git a/tests/filtering/ma_test_filtering_lpf.c b/tests/filtering/filtering_lpf.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_lpf.c
rename to tests/filtering/filtering_lpf.c
diff --git a/tests/filtering/ma_test_filtering_notch.c b/tests/filtering/filtering_notch.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_notch.c
rename to tests/filtering/filtering_notch.c
diff --git a/tests/filtering/ma_test_filtering_peak.c b/tests/filtering/filtering_peak.c
similarity index 100%
rename from tests/filtering/ma_test_filtering_peak.c
rename to tests/filtering/filtering_peak.c
diff --git a/tests/generation/generation.c b/tests/generation/generation.c
index f04397c7..31d9fecd 100644
--- a/tests/generation/generation.c
+++ b/tests/generation/generation.c
@@ -1,8 +1,8 @@
 #define MA_NO_DEVICE_IO
-#include "../test_common/ma_test_common.c"
+#include "../common/common.c"
 
-#include "ma_test_generation_noise.c"
-#include "ma_test_generation_waveform.c"
+#include "generation_noise.c"
+#include "generation_waveform.c"
 
 int main(int argc, char** argv)
 {
diff --git a/tests/generation/ma_test_generation_noise.c b/tests/generation/generation_noise.c
similarity index 100%
rename from tests/generation/ma_test_generation_noise.c
rename to tests/generation/generation_noise.c
diff --git a/tests/generation/ma_test_generation_waveform.c b/tests/generation/generation_waveform.c
similarity index 100%
rename from tests/generation/ma_test_generation_waveform.c
rename to tests/generation/generation_waveform.c