diff --git a/miniaudio.h b/miniaudio.h
index 9265ab42..a15df1b3 100644
--- a/miniaudio.h
+++ b/miniaudio.h
@@ -40685,8 +40685,8 @@ static void ma_device_uninit__aaudio(ma_device* pDevice)
 
 static ma_result ma_device_start_stream__aaudio(ma_device* pDevice, ma_AAudioStream* pStream)
 {
-    ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);
-    /*ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));*/
+    /*ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);*/
+    ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));
     ma_aaudio_result_t resultAA;
     ma_aaudio_stream_state_t currentState;
 
@@ -40723,8 +40723,8 @@ static ma_result ma_device_start_stream__aaudio(ma_device* pDevice, ma_AAudioStr
 
 static ma_result ma_device_stop_stream__aaudio(ma_device* pDevice, ma_AAudioStream* pStream)
 {
-    ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);
-    /*ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));*/
+    /*ma_device_state_aaudio* pDeviceStateAAudio = ma_device_get_backend_state__aaudio(pDevice);*/
+    ma_context_state_aaudio* pContextStateAAudio = ma_context_get_backend_state__aaudio(ma_device_get_context(pDevice));
     ma_aaudio_result_t resultAA;
     ma_aaudio_stream_state_t currentState;
 
diff --git a/tests/android/MiniaudioTester/app/build.gradle.kts b/tests/android/MiniaudioTester/app/build.gradle.kts
index f6bfa198..d2b7d2c4 100644
--- a/tests/android/MiniaudioTester/app/build.gradle.kts
+++ b/tests/android/MiniaudioTester/app/build.gradle.kts
@@ -15,6 +15,12 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        externalNativeBuild {
+            cmake {
+                cppFlags += "-Wall -Wextra -pedantic"
+            }
+        }
     }
 
     buildTypes {
diff --git a/tests/android/MiniaudioTester/app/src/main/cpp/native-lib.cpp b/tests/android/MiniaudioTester/app/src/main/cpp/native-lib.cpp
index d668571e..14c0553a 100644
--- a/tests/android/MiniaudioTester/app/src/main/cpp/native-lib.cpp
+++ b/tests/android/MiniaudioTester/app/src/main/cpp/native-lib.cpp
@@ -34,6 +34,8 @@ static void data_callback(ma_device* pDevice, void* pFramesOut, const void* pFra
     auto* pAudioState = (audio_state_t*)pDevice->pUserData;
     assert(pAudioState != nullptr);
 
+    (void)pFramesIn;
+
     ma_waveform_read_pcm_frames(&pAudioState->waveform, pFramesOut, frameCount, nullptr);
 }
 
@@ -56,6 +58,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_UninitializeAudio(JNIEnv *env, jobj
     pAudioState->hasError = false;
     pAudioState->errorMessage = "";
 
+    (void)env;
+
     return (jlong)pAudioState;
 }
 
@@ -114,6 +118,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_PlayAudio(JNIEnv *env, jobject, jlo
         audio_state_set_error(pAudioState, (std::string("Failed to start device. ") + ma_result_description(result)).c_str());
     }
 
+    (void)env;
+
     return (jlong)pAudioState;
 }
 
@@ -137,6 +143,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_PauseAudio(JNIEnv *env, jobject, jl
         }
     }
 
+    (void)env;
+
     return (jlong)pAudioState;
 }
 
@@ -149,6 +157,8 @@ Java_io_miniaud_miniaudiotester_MainActivity_HasAudioError(JNIEnv *env, jobject,
         return true;
     }
 
+    (void)env;
+
     return pAudioState->hasError;
 }