diff --git a/tests/UnitTests/CoreGraphics.drawing/CGContextDrawingTests.cpp b/tests/UnitTests/CoreGraphics.drawing/CGContextDrawingTests.cpp
index db2d99a991..e95f70a4c5 100644
--- a/tests/UnitTests/CoreGraphics.drawing/CGContextDrawingTests.cpp
+++ b/tests/UnitTests/CoreGraphics.drawing/CGContextDrawingTests.cpp
@@ -78,7 +78,7 @@ static void _SetPatternForFill(CGContextRef context, CGRect rect, float xStep, f
     CGContextSetFillPattern(context, pattern, color);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternStroke, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternStroke, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -88,7 +88,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternStroke, UIKitMimicTest) {
     CGContextStrokeRect(context, borderRect);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternStrokeSliced, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternStrokeSliced, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -98,7 +98,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternStrokeSliced, UIKitMimicTest) {
     CGContextStrokeRect(context, borderRect);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternDrawPath, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternDrawPath, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -133,7 +133,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternDrawPath, UIKitMimicTest) {
     CGPathRelease(theSecondPath);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternFill, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternFill, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -141,7 +141,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternFill, UIKitMimicTest) {
     CGContextFillRect(context, bounds);
 }
 
-DRAW_TEST_F(CGContext, PatternFillNULLRect, UIKitMimicTest) {
+DRAW_TEST_F(CGContext, PatternFillNULLRect, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -155,7 +155,7 @@ DRAW_TEST_F(CGContext, PatternFillNULLRect, UIKitMimicTest) {
     CGContextFillRect(context, borderRect);
 }
 
-DRAW_TEST_F(CGContext, PatternStrokeNULLRect, UIKitMimicTest) {
+DRAW_TEST_F(CGContext, PatternStrokeNULLRect, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -168,7 +168,7 @@ DRAW_TEST_F(CGContext, PatternStrokeNULLRect, UIKitMimicTest) {
     CGContextStrokeRect(context, borderRect);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternFillSliced, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternFillSliced, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -176,7 +176,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternFillSliced, UIKitMimicTest) {
     CGContextFillRect(context, bounds);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, Canva, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, Canva, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -192,7 +192,7 @@ DISABLED_DRAW_TEST_F(CGContext, Canva, UIKitMimicTest) {
     CGContextFillRect(context, middleSpot);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoWithAlpha, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoWithAlpha, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -201,7 +201,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoWithAlpha, UIKitMimicTest)
     CGContextFillRect(context, bounds);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoRotate, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoRotate, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -210,7 +210,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoRotate, UIKitMimicTest) {
     CGContextFillRect(context, bounds);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoRegion, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoRegion, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -219,7 +219,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoRegion, UIKitMimicTest) {
     CGContextFillRect(context, borderRect);
 }
 
-DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoPath, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoPath, UIKitMimicTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -242,7 +242,7 @@ DISABLED_DRAW_TEST_F(CGContext, PatternFillWindowsLogoPath, UIKitMimicTest) {
 #ifdef WINOBJC
 #include "CGContextInternal.h"
 
-DISABLED_DRAW_TEST_F(CGContext, DrawIntoRect, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, DrawIntoRect, UIKitMimicTest<>) {
     // Draw a portion of an image into a different region.
     auto drawingConfig = DrawingTestConfig::Get();
 
@@ -272,139 +272,139 @@ static void _drawTiledImage(CGContextRef context, CGRect rect, const std::string
     CGContextDrawTiledImage(context, rect, image.get());
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeart, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeart, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 128, 128 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledUp, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledUp, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 250, 250 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledTiny, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledTiny, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 1, 1 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledAlpha1, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledAlpha1, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 100, 100 } };
     CGContextSetAlpha(GetDrawingContext(), 0.8);
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledAlpha2, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledAlpha2, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 256, 256 } };
     CGContextSetAlpha(GetDrawingContext(), 0.24);
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledAlpha3, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledAlpha3, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 300, 513 } };
     CGContextSetAlpha(GetDrawingContext(), 0.66);
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledDown, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaledDown, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 50, 50 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaled, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageHeartScaled, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 250, 128 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageHeart.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDog, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDog, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 256, 256 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledDown, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledDown, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 50, 50 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledUp, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledUp, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 512, 512 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaled, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaled, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 350, 500 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaled2, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaled2, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 128, 240 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAspectRatioWrong, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAspectRatioWrong, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 1024, 25 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAspectRatio, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAspectRatio, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 1024, 1024 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAlpha, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAlpha, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 100, 100 } };
     CGContextSetAlpha(GetDrawingContext(), 0.8);
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAlpha2, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAlpha2, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 256, 256 } };
     CGContextSetAlpha(GetDrawingContext(), 0.24);
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAlpha3, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageDogScaledAlpha3, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 300, 513 } };
     CGContextSetAlpha(GetDrawingContext(), 0.66);
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageDog.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageCustom, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageCustom, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 562, 469 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageCircleMe.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledUp, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledUp, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 2050, 2050 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageCircleMe.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledDown, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledDown, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 20, 20 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageCircleMe.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledDownReallyLow, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledDownReallyLow, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 1, 1 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageCircleMe.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaled, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaled, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 10, 250 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageCircleMe.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledObscure, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledObscure, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 253, 13 } };
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageCircleMe.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledAlpha, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, TiledImageCustomScaledAlpha, UIKitMimicTest<>) {
     CGRect rect = { { 0, 0 }, { 128, 128 } };
     CGContextSetAlpha(GetDrawingContext(), 0.88);
     _drawTiledImage(GetDrawingContext(), rect, "tiledImageCircleMe.png");
 }
 
-DISABLED_DRAW_TEST_F(CGContext, DrawAnImage, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGContext, DrawAnImage, UIKitMimicTest<>) {
     // Load an Image and draw it into the canvas context
     auto drawingConfig = DrawingTestConfig::Get();
 
@@ -422,7 +422,7 @@ DISABLED_DRAW_TEST_F(CGContext, DrawAnImage, UIKitMimicTest) {
     CGContextDrawImage(context, bounds, image.get());
 }
 
-DRAW_TEST_F(CGContext, DrawAnImageWithOpacity, UIKitMimicTest) {
+DRAW_TEST_F(CGContext, DrawAnImageWithOpacity, UIKitMimicTest<>) {
     // Load an Image and draw it into the canvas context
     auto drawingConfig = DrawingTestConfig::Get();
 
@@ -441,7 +441,7 @@ DRAW_TEST_F(CGContext, DrawAnImageWithOpacity, UIKitMimicTest) {
     CGContextDrawImage(context, bounds, image.get());
 }
 
-DRAW_TEST_F(CGContext, DrawAnImageWithInterpolationQuality, UIKitMimicTest) {
+DRAW_TEST_F(CGContext, DrawAnImageWithInterpolationQuality, UIKitMimicTest<>) {
     auto drawingConfig = DrawingTestConfig::Get();
 
     woc::unique_cf<CFStringRef> testFilename{ _CFStringCreateWithStdString(drawingConfig->GetResourcePath("png1.9.png")) };
@@ -455,7 +455,7 @@ DRAW_TEST_F(CGContext, DrawAnImageWithInterpolationQuality, UIKitMimicTest) {
     CGContextDrawImage(context, bounds, image.get());
 }
 
-DRAW_TEST_F(CGContext, DrawAnImageWithInterpolationQualityAndAlpha, UIKitMimicTest) {
+DRAW_TEST_F(CGContext, DrawAnImageWithInterpolationQualityAndAlpha, UIKitMimicTest<>) {
     auto drawingConfig = DrawingTestConfig::Get();
     woc::unique_cf<CFStringRef> testFilename{ _CFStringCreateWithStdString(drawingConfig->GetResourcePath("png1.9.png")) };
     woc::unique_cf<CGImageRef> image{ _CGImageCreateFromPNGFile(testFilename.get()) };
diff --git a/tests/UnitTests/CoreGraphics.drawing/DrawingTest.cpp b/tests/UnitTests/CoreGraphics.drawing/DrawingTest.cpp
index 0dde5ff633..a52440cd53 100644
--- a/tests/UnitTests/CoreGraphics.drawing/DrawingTest.cpp
+++ b/tests/UnitTests/CoreGraphics.drawing/DrawingTest.cpp
@@ -24,19 +24,6 @@
 
 static const CGSize g_defaultCanvasSize{ 512.f, 256.f };
 
-template <typename TComparator>
-woc::unique_cf<CGColorSpaceRef> testing::DrawTest<TComparator>::s_deviceColorSpace;
-
-template <typename TComparator>
-void testing::DrawTest<TComparator>::SetUpTestCase() {
-    s_deviceColorSpace.reset(CGColorSpaceCreateDeviceRGB());
-}
-
-template <typename TComparator>
-void testing::DrawTest<TComparator>::TearDownTestCase() {
-    s_deviceColorSpace.release();
-}
-
 template <typename TComparator>
 CGSize testing::DrawTest<TComparator>::CanvasSize() {
     return g_defaultCanvasSize;
@@ -46,8 +33,9 @@ template <typename TComparator>
 void testing::DrawTest<TComparator>::SetUp() {
     CGSize size = CanvasSize();
 
+    auto deviceColorSpace = woc::MakeStrongCF<CGColorSpaceRef>(CGColorSpaceCreateDeviceRGB());
     _context.reset(CGBitmapContextCreate(
-        nullptr, size.width, size.height, 8, size.width * 4, s_deviceColorSpace.get(), kCGImageAlphaPremultipliedFirst));
+        nullptr, size.width, size.height, 8, size.width * 4, deviceColorSpace, kCGImageAlphaPremultipliedFirst));
     ASSERT_NE(nullptr, _context);
 
     _bounds = { CGPointZero, size };
diff --git a/tests/UnitTests/CoreGraphics.drawing/DrawingTest.h b/tests/UnitTests/CoreGraphics.drawing/DrawingTest.h
index 513981cfbe..d93a89e56c 100644
--- a/tests/UnitTests/CoreGraphics.drawing/DrawingTest.h
+++ b/tests/UnitTests/CoreGraphics.drawing/DrawingTest.h
@@ -31,13 +31,7 @@ class DrawTest : public ::testing::Test {
     woc::unique_cf<CGContextRef> _context;
     CGRect _bounds;
 
-protected:
-    static woc::unique_cf<CGColorSpaceRef> s_deviceColorSpace;
-
 public:
-    static void SetUpTestCase();
-    static void TearDownTestCase();
-
     virtual CFStringRef CreateAdditionalTestDescription();
     virtual CFStringRef CreateOutputFilename();
     virtual CGSize CanvasSize();
diff --git a/tests/unittests/CoreGraphics.drawing/CGContextDrawing_GradientTests.cpp b/tests/unittests/CoreGraphics.drawing/CGContextDrawing_GradientTests.cpp
index c737b08103..7206a5357c 100644
--- a/tests/unittests/CoreGraphics.drawing/CGContextDrawing_GradientTests.cpp
+++ b/tests/unittests/CoreGraphics.drawing/CGContextDrawing_GradientTests.cpp
@@ -47,7 +47,7 @@ static void _drawShortLinearGradientWithOptions(CGContextRef context, CGRect bou
                         option);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradient, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradient, UIKitMimicTest<>) {
     CGFloat locations[2] = { 0, 1 };
     CGFloat components[8] = { 0.0, 0.0, 1, 1.0, 1.0, 0, 0, 1.0 };
     _drawLinearGradient(GetDrawingContext(),
@@ -58,19 +58,19 @@ DISABLED_DRAW_TEST_F(CGGradient, LinearGradient, UIKitMimicTest) {
                         kCGGradientDrawsBeforeStartLocation);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradientShortBothSides_Options_0, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradientShortBothSides_Options_0, UIKitMimicTest<>) {
     _drawShortLinearGradientWithOptions(GetDrawingContext(), GetDrawingBounds(), 0);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradientShortBothSides_Options_kCGGradientDrawsBeforeStartLocation, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradientShortBothSides_Options_kCGGradientDrawsBeforeStartLocation, UIKitMimicTest<>) {
     _drawShortLinearGradientWithOptions(GetDrawingContext(), GetDrawingBounds(), kCGGradientDrawsBeforeStartLocation);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradientShortBothSides_Options_kCGGradientDrawsAfterEndLocation, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradientShortBothSides_Options_kCGGradientDrawsAfterEndLocation, UIKitMimicTest<>) {
     _drawShortLinearGradientWithOptions(GetDrawingContext(), GetDrawingBounds(), kCGGradientDrawsAfterEndLocation);
 }
 
-DRAW_TEST_F(CGGradient, LinearGradientInvalidCount, UIKitMimicTest) {
+DRAW_TEST_F(CGGradient, LinearGradientInvalidCount, UIKitMimicTest<>) {
     CGFloat locations[] = { 0.0 };
 
     CGFloat components[] = {
@@ -89,7 +89,7 @@ DRAW_TEST_F(CGGradient, LinearGradientInvalidCount, UIKitMimicTest) {
     CFRelease(gradient);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradient2, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradient2, UIKitMimicTest<>) {
     CGFloat locations[] = { 0.0, 0.33, 0.66, 1.0 };
 
     CGFloat components[] = {
@@ -104,7 +104,7 @@ DISABLED_DRAW_TEST_F(CGGradient, LinearGradient2, UIKitMimicTest) {
                         kCGGradientDrawsBeforeStartLocation);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradient2Short, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradient2Short, UIKitMimicTest<>) {
     CGFloat locations[] = { 0.0, 0.33, 1.0 };
 
     CGFloat components[] = { 0.85, 0, 0, 1.0, 1, 0, 0, 1.0, 0.85, 0.3, 0, 1.0 };
@@ -116,7 +116,7 @@ DISABLED_DRAW_TEST_F(CGGradient, LinearGradient2Short, UIKitMimicTest) {
                         kCGGradientDrawsBeforeStartLocation);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradient3, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradient3, UIKitMimicTest<>) {
     CGFloat locations[] = { 0.0, 0.5, 1 };
 
     CGFloat components[] = {
@@ -130,7 +130,7 @@ DISABLED_DRAW_TEST_F(CGGradient, LinearGradient3, UIKitMimicTest) {
                         kCGGradientDrawsBeforeStartLocation);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithLowOpacity, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithLowOpacity, UIKitMimicTest<>) {
     CGFloat locations[] = { 0.0, 0.5, 1 };
 
     CGFloat components[] = {
@@ -145,7 +145,7 @@ DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithLowOpacity, UIKitMimicTest) {
                         kCGGradientDrawsBeforeStartLocation);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithAlpha, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithAlpha, UIKitMimicTest<>) {
     CGFloat locations[] = { 0.0, 0.25, 0.5, 0.6, 0.8, 0.9, 1 };
 
     CGFloat components[] = {
@@ -161,7 +161,7 @@ DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithAlpha, UIKitMimicTest) {
                         kCGGradientDrawsBeforeStartLocation);
 }
 
-DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithLowOpacityShort, UIKitMimicTest) {
+DISABLED_DRAW_TEST_F(CGGradient, LinearGradientWithLowOpacityShort, UIKitMimicTest<>) {
     CGFloat locations[] = { 0.0, 0.5, 1 };
 
     CGFloat components[] = {
diff --git a/tests/unittests/CoreGraphics.drawing/CGContextDrawing_ImageMaskTests.cpp b/tests/unittests/CoreGraphics.drawing/CGContextDrawing_ImageMaskTests.cpp
index cb6c15ed3b..e9144cdfea 100644
--- a/tests/unittests/CoreGraphics.drawing/CGContextDrawing_ImageMaskTests.cpp
+++ b/tests/unittests/CoreGraphics.drawing/CGContextDrawing_ImageMaskTests.cpp
@@ -115,7 +115,7 @@ void __GradientMaskGenerator(CGContextRef context, CGSize size, ClippingType cli
     }
 }
 
-class CGContextClipping : public ::testing::DrawTest,
+class CGContextClipping : public ::testing::DrawTest<>,
                           public ::testing::WithParamInterface<::testing::tuple<ClippingShape, ClippingType, CGSize>> {
 private:
     static std::vector<std::tuple<ClippingShape, CGSize, std::function<void(CGContextRef, CGSize, ClippingType)>>> s_maskGenerators;
diff --git a/tests/unittests/CoreGraphics.drawing/CGContextTransparencyLayerTests.cpp b/tests/unittests/CoreGraphics.drawing/CGContextTransparencyLayerTests.cpp
index a5c16c9c9f..19754a2a61 100644
--- a/tests/unittests/CoreGraphics.drawing/CGContextTransparencyLayerTests.cpp
+++ b/tests/unittests/CoreGraphics.drawing/CGContextTransparencyLayerTests.cpp
@@ -27,7 +27,7 @@ static void _strokeTwoCirclesInContext(CGContextRef context, CGRect bounds) {
     }
 }
 
-DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, IsShadowedAllAtOnce, WhiteBackgroundTest) {
+DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, IsShadowedAllAtOnce, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -52,7 +52,7 @@ DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, IsShadowedAllAtOnce, WhiteBackg
     CGContextEndTransparencyLayer(context);
 }
 
-DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, StacksInnerAndOuterShadow, WhiteBackgroundTest) {
+DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, StacksInnerAndOuterShadow, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -70,7 +70,7 @@ DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, StacksInnerAndOuterShadow, Whit
     CGContextEndTransparencyLayer(context);
 }
 
-DRAW_TEST_F(CGContextTransparencyLayer, FloodFill_GlobalAlpha0_5f, WhiteBackgroundTest) {
+DRAW_TEST_F(CGContextTransparencyLayer, FloodFill_GlobalAlpha0_5f, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -84,7 +84,7 @@ DRAW_TEST_F(CGContextTransparencyLayer, FloodFill_GlobalAlpha0_5f, WhiteBackgrou
     CGContextEndTransparencyLayer(context);
 }
 
-DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, DrawCircles_GlobalAlpha0_5f, WhiteBackgroundTest) {
+DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, DrawCircles_GlobalAlpha0_5f, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -100,7 +100,7 @@ DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, DrawCircles_GlobalAlpha0_5f, Wh
     CGContextEndTransparencyLayer(context);
 }
 
-DRAW_TEST_F(CGContextTransparencyLayer, ZeroGlobalAlpha, WhiteBackgroundTest) {
+DRAW_TEST_F(CGContextTransparencyLayer, ZeroGlobalAlpha, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -116,7 +116,7 @@ DRAW_TEST_F(CGContextTransparencyLayer, ZeroGlobalAlpha, WhiteBackgroundTest) {
     CGContextEndTransparencyLayer(context);
 }
 
-DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerDrawingCircles, WhiteBackgroundTest) {
+DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerDrawingCircles, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -133,7 +133,7 @@ DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerDrawingCircles, Whi
     CGContextEndTransparencyLayer(context);
 }
 
-DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill, WhiteBackgroundTest) {
+DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -149,7 +149,7 @@ DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill, WhiteBackgroundTe
 }
 
 // The shadow should extend beyond the bounds of the layer content, even if it is clipped.
-DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFillShadow, WhiteBackgroundTest) {
+DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFillShadow, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -166,7 +166,7 @@ DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFillShadow, Wh
     CGContextEndTransparencyLayer(context);
 }
 
-DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill_GlobalTransform, WhiteBackgroundTest) {
+DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill_GlobalTransform, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -184,7 +184,7 @@ DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill_GlobalTra
 }
 
 // The shadow should extend beyond the bounds of the layer content, even if it is clipped.
-DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerDrawingCircles_GlobalTransform, WhiteBackgroundTest) {
+DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerDrawingCircles_GlobalTransform, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();
 
@@ -205,7 +205,7 @@ DISABLED_DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerDrawingCircles_Glob
     CGContextEndTransparencyLayer(context);
 }
 
-DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill_GlobalClip, WhiteBackgroundTest) {
+DRAW_TEST_F(CGContextTransparencyLayer, BoundedLayerFloodFill_GlobalClip, WhiteBackgroundTest<>) {
     CGContextRef context = GetDrawingContext();
     CGRect bounds = GetDrawingBounds();