diff --git a/test/Android.mk b/test/Android.mk
index 0ba319b..a172599 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -18,7 +18,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := armnn-driver-tests@1.0
-ifeq ($(PLATFORM_VERSION),Q)
+ifeq ($(Q_OR_LATER),1)
 # "eng" is deprecated in Android Q
 LOCAL_MODULE_TAGS := optional
 else
@@ -36,7 +36,7 @@
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -Werror \
         -O0 \
@@ -49,6 +49,11 @@
         -DARMNN_ANDROID_P
 endif # PLATFORM_VERSION == 9
 
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
+
 LOCAL_SRC_FILES := \
         1.0/Convolution2D.cpp \
         1.0/FullyConnectedReshape.cpp \
@@ -118,7 +123,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := armnn-driver-tests@1.1
-ifeq ($(PLATFORM_VERSION),Q)
+ifeq ($(Q_OR_LATER),1)
 # "eng" is deprecated in Android Q
 LOCAL_MODULE_TAGS := optional
 else
@@ -137,7 +142,7 @@
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -Werror \
         -O0 \
@@ -145,6 +150,11 @@
         -DARMNN_ANDROID_P \
         -DARMNN_ANDROID_NN_V1_1
 
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
+
 LOCAL_SRC_FILES := \
         1.0/Convolution2D.cpp \
         1.1/Convolution2D.cpp \
@@ -227,7 +237,7 @@
         $(ARMNN_DRIVER_HEADER_PATH)
 
 LOCAL_CFLAGS := \
-        -std=c++14 \
+        -std=$(CPP_VERSION) \
         -fexceptions \
         -Werror \
         -O0 \
@@ -235,6 +245,11 @@
         -DARMNN_ANDROID_Q \
         -DARMNN_ANDROID_NN_V1_2
 
+ifeq ($(Q_OR_LATER),1)
+LOCAL_CFLAGS += \
+        -DBOOST_NO_AUTO_PTR
+endif # PLATFORM_VERSION == Q or later
+
 LOCAL_SRC_FILES := \
         1.0/Convolution2D.cpp \
         1.1/Convolution2D.cpp \