diff --git a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp b/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp
index 68ca82880a..bdc60c37e4 100644
--- a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp
+++ b/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp
@@ -30,7 +30,7 @@ class MockSettingsReader : public SettingsReader {
     const char *appSpecificLocation(const std::string &name) override { return name.c_str(); };
 };
 
-TEST(SettingsReader, Create) {
+TEST(SettingsReader, WhenCreatingSettingsReaderThenReaderIsCreated) {
     SettingsReader *reader = SettingsReader::create(oclRegPath);
     EXPECT_NE(nullptr, reader);
     delete reader;
@@ -45,7 +45,7 @@ TEST(SettingsReader, GivenNoSettingsFileWhenCreatingSettingsReaderThenOsReaderIs
     EXPECT_NE(nullptr, osReader.get());
 }
 
-TEST(SettingsReader, GivenSettingsFileExistsWhenCreatingSettingsReaderThenFileReaderIsCreated) {
+TEST(SettingsReader, GivenSettingsFileExistsWhenCreatingSettingsReaderThenReaderIsCreated) {
     bool settingsFileExists = fileExists(SettingsReader::settingsFileName);
     if (!settingsFileExists) {
         const char data[] = "ProductFamilyOverride = test";
@@ -59,7 +59,7 @@ TEST(SettingsReader, GivenSettingsFileExistsWhenCreatingSettingsReaderThenFileRe
     std::remove(SettingsReader::settingsFileName);
 }
 
-TEST(SettingsReader, CreateFileReader) {
+TEST(SettingsReader, WhenCreatingFileReaderThenReaderIsCreated) {
     bool settingsFileExists = fileExists(SettingsReader::settingsFileName);
     if (!settingsFileExists) {
         char data = 0;
@@ -74,19 +74,19 @@ TEST(SettingsReader, CreateFileReader) {
     delete reader;
 }
 
-TEST(SettingsReader, CreateOsReader) {
+TEST(SettingsReader, WhenCreatingOsReaderThenReaderIsCreated) {
     SettingsReader *reader = SettingsReader::createOsReader(false, oclRegPath);
     EXPECT_NE(nullptr, reader);
     delete reader;
 }
 
-TEST(SettingsReader, CreateOsReaderWithRegKey) {
+TEST(SettingsReader, GivenRegKeyWhenCreatingOsReaderThenReaderIsCreated) {
     std::string regKey = oclRegPath;
     std::unique_ptr<SettingsReader> reader(SettingsReader::createOsReader(false, regKey));
     EXPECT_NE(nullptr, reader);
 }
 
-TEST(SettingsReader, givenPrintDebugStringWhenCalledWithTrueItPrintsToOutput) {
+TEST(SettingsReader, GivenTrueWhenPrintingDebugStringThenPrintsToOutput) {
     int i = 4;
     testing::internal::CaptureStdout();
     printDebugString(true, stdout, "testing error %d", i);
@@ -94,7 +94,7 @@ TEST(SettingsReader, givenPrintDebugStringWhenCalledWithTrueItPrintsToOutput) {
     EXPECT_STRNE(output.c_str(), "");
 }
 
-TEST(SettingsReader, givenPrintDebugStringWhenCalledWithFalseThenNothingIsPrinted) {
+TEST(SettingsReader, GivenFalseWhenPrintingDebugStringThenNoOutput) {
     int i = 4;
     testing::internal::CaptureStdout();
     printDebugString(false, stderr, "Error String %d", i);