Remove detection of GPU name on mobile platforms

79 files changed, 0 insertions, 723 deletions

diff --git a/test/mock/alcatel-revvl.cc b/test/mock/alcatel-revvl.cc
index 1382888..e76db85 100644
--- a/test/mock/alcatel-revvl.cc
+++ b/test/mock/alcatel-revvl.cc
@@ -279,14 +279,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T860",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -657,7 +649,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T860");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/alldocube-iwork8.cc b/test/mock/alldocube-iwork8.cc
index 8664f3a..aa8f4c5 100644
--- a/test/mock/alldocube-iwork8.cc
+++ b/test/mock/alldocube-iwork8.cc
@@ -218,14 +218,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Intel Gen 8",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -693,9 +685,6 @@ TEST(L4, none) {
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 	cpuinfo_mock_set_cpuid(cpuid_dump, sizeof(cpuid_dump) / sizeof(cpuinfo_mock_cpuid));
-#ifdef __ANDROID__
-	cpuinfo_mock_gl_renderer("Intel(R) HD Graphics for Atom(TM) x5/x7");
-#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/mock/atm7029b-tablet.cc b/test/mock/atm7029b-tablet.cc
index c8462bc..d8d20a9 100644
--- a/test/mock/atm7029b-tablet.cc
+++ b/test/mock/atm7029b-tablet.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR SGX540",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("PowerVR SGX 540");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/blu-r1-hd.cc b/test/mock/blu-r1-hd.cc
index 120edc5..d60de65 100644
--- a/test/mock/blu-r1-hd.cc
+++ b/test/mock/blu-r1-hd.cc
@@ -218,14 +218,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T720",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -558,7 +550,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T720");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-a3-2016-eu.cc b/test/mock/galaxy-a3-2016-eu.cc
index 3f0a4ce..2cfd1a4 100644
--- a/test/mock/galaxy-a3-2016-eu.cc
+++ b/test/mock/galaxy-a3-2016-eu.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T720",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -582,7 +574,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T720");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-a8-2016-duos.cc b/test/mock/galaxy-a8-2016-duos.cc
index 1a3058e..6f046b9 100644
--- a/test/mock/galaxy-a8-2016-duos.cc
+++ b/test/mock/galaxy-a8-2016-duos.cc
@@ -300,14 +300,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 405",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -654,7 +646,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 405");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-a8-2018.cc b/test/mock/galaxy-a8-2018.cc
index 4bcefb1..fc27e65 100644
--- a/test/mock/galaxy-a8-2018.cc
+++ b/test/mock/galaxy-a8-2018.cc
@@ -354,14 +354,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-G71",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -785,7 +777,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-G71");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-c9-pro.cc b/test/mock/galaxy-c9-pro.cc
index 44a628a..00fc5dd 100644
--- a/test/mock/galaxy-c9-pro.cc
+++ b/test/mock/galaxy-c9-pro.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 510",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -772,7 +764,6 @@ int main(int argc, char* argv[]) {
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
 #endif
-	cpuinfo_mock_gl_renderer("Adreno (TM) 510");
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/mock/galaxy-grand-prime-value-edition.cc b/test/mock/galaxy-grand-prime-value-edition.cc
index ece2820..e709e75 100644
--- a/test/mock/galaxy-grand-prime-value-edition.cc
+++ b/test/mock/galaxy-grand-prime-value-edition.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-400",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-400 MP");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-j1-2016.cc b/test/mock/galaxy-j1-2016.cc
index 303b973..e3b8420 100644
--- a/test/mock/galaxy-j1-2016.cc
+++ b/test/mock/galaxy-j1-2016.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-400",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-400 MP");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-j5.cc b/test/mock/galaxy-j5.cc
index fd509b8..6df2b0a 100644
--- a/test/mock/galaxy-j5.cc
+++ b/test/mock/galaxy-j5.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 306",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 306");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-j7-prime.cc b/test/mock/galaxy-j7-prime.cc
index 97572d1..543e53f 100644
--- a/test/mock/galaxy-j7-prime.cc
+++ b/test/mock/galaxy-j7-prime.cc
@@ -280,14 +280,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T830",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -656,7 +648,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T830");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-j7-tmobile.cc b/test/mock/galaxy-j7-tmobile.cc
index 7248165..40f883d 100644
--- a/test/mock/galaxy-j7-tmobile.cc
+++ b/test/mock/galaxy-j7-tmobile.cc
@@ -280,14 +280,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T720",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -656,7 +648,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T720");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-j7-uae.cc b/test/mock/galaxy-j7-uae.cc
index 934e792..07f6473 100644
--- a/test/mock/galaxy-j7-uae.cc
+++ b/test/mock/galaxy-j7-uae.cc
@@ -280,14 +280,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T720",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -656,7 +648,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T720");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s3-us.cc b/test/mock/galaxy-s3-us.cc
index 52d6130..3077911 100644
--- a/test/mock/galaxy-s3-us.cc
+++ b/test/mock/galaxy-s3-us.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 225",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -555,7 +547,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 225");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s4-us.cc b/test/mock/galaxy-s4-us.cc
index 9f0fac3..36cc657 100644
--- a/test/mock/galaxy-s4-us.cc
+++ b/test/mock/galaxy-s4-us.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 320",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -555,7 +547,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 320");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s5-global.cc b/test/mock/galaxy-s5-global.cc
index bfc628e..f40390d 100644
--- a/test/mock/galaxy-s5-global.cc
+++ b/test/mock/galaxy-s5-global.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T628",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -727,7 +719,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T628");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s5-us.cc b/test/mock/galaxy-s5-us.cc
index 3b6cc5b..650ea9e 100644
--- a/test/mock/galaxy-s5-us.cc
+++ b/test/mock/galaxy-s5-us.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 330",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -555,7 +547,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 330");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s6.cc b/test/mock/galaxy-s6.cc
index 2f8ac96..fbd5723 100644
--- a/test/mock/galaxy-s6.cc
+++ b/test/mock/galaxy-s6.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T760",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -771,7 +763,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T760");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s7-global.cc b/test/mock/galaxy-s7-global.cc
index f0945f5..5cdd522 100644
--- a/test/mock/galaxy-s7-global.cc
+++ b/test/mock/galaxy-s7-global.cc
@@ -360,14 +360,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T880",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -797,7 +789,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T880");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s7-us.cc b/test/mock/galaxy-s7-us.cc
index 080b623..71f423c 100644
--- a/test/mock/galaxy-s7-us.cc
+++ b/test/mock/galaxy-s7-us.cc
@@ -296,14 +296,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 530",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -681,7 +673,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 530");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s8-global.cc b/test/mock/galaxy-s8-global.cc
index 3052c06..b0f8576 100644
--- a/test/mock/galaxy-s8-global.cc
+++ b/test/mock/galaxy-s8-global.cc
@@ -360,14 +360,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-G71",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -797,7 +789,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-G71");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s8-us.cc b/test/mock/galaxy-s8-us.cc
index f5cd0c6..39145d3 100644
--- a/test/mock/galaxy-s8-us.cc
+++ b/test/mock/galaxy-s8-us.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 540",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -784,7 +776,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 540");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s9-global.cc b/test/mock/galaxy-s9-global.cc
index c4bd401..fd52254 100644
--- a/test/mock/galaxy-s9-global.cc
+++ b/test/mock/galaxy-s9-global.cc
@@ -373,14 +373,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-G72",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -861,7 +853,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-G72");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-s9-us.cc b/test/mock/galaxy-s9-us.cc
index 4e81832..baa2ced 100644
--- a/test/mock/galaxy-s9-us.cc
+++ b/test/mock/galaxy-s9-us.cc
@@ -327,14 +327,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 630",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -813,7 +805,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 630");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-tab-3-7.0.cc b/test/mock/galaxy-tab-3-7.0.cc
index 2d42830..1f28140 100644
--- a/test/mock/galaxy-tab-3-7.0.cc
+++ b/test/mock/galaxy-tab-3-7.0.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Vivante GC1000",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("GC1000 core");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-tab-3-lite.cc b/test/mock/galaxy-tab-3-lite.cc
index c5d3d9b..018e17f 100644
--- a/test/mock/galaxy-tab-3-lite.cc
+++ b/test/mock/galaxy-tab-3-lite.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-400",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-400 MP");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/galaxy-win-duos.cc b/test/mock/galaxy-win-duos.cc
index 5cc857c..ae671ee 100644
--- a/test/mock/galaxy-win-duos.cc
+++ b/test/mock/galaxy-win-duos.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 203",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 203");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-ascend-p7.cc b/test/mock/huawei-ascend-p7.cc
index d4d8412..fc1c951 100644
--- a/test/mock/huawei-ascend-p7.cc
+++ b/test/mock/huawei-ascend-p7.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-450",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-450 MP");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-honor-6.cc b/test/mock/huawei-honor-6.cc
index 2a28662..41b429e 100644
--- a/test/mock/huawei-honor-6.cc
+++ b/test/mock/huawei-honor-6.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T624",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -727,7 +719,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T628");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-mate-10.cc b/test/mock/huawei-mate-10.cc
index fb51bef..477103f 100644
--- a/test/mock/huawei-mate-10.cc
+++ b/test/mock/huawei-mate-10.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-G72",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -784,7 +776,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-G72");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-mate-8.cc b/test/mock/huawei-mate-8.cc
index 902f686..7651ba7 100644
--- a/test/mock/huawei-mate-8.cc
+++ b/test/mock/huawei-mate-8.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T880",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -771,7 +763,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T880");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-mate-9.cc b/test/mock/huawei-mate-9.cc
index 1730179..c3b4562 100644
--- a/test/mock/huawei-mate-9.cc
+++ b/test/mock/huawei-mate-9.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-G71",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -784,7 +776,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-G71");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-p20-pro.cc b/test/mock/huawei-p20-pro.cc
index 0710c84..382bd1d 100644
--- a/test/mock/huawei-p20-pro.cc
+++ b/test/mock/huawei-p20-pro.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-G72",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -784,7 +776,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-G72");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-p8-lite.cc b/test/mock/huawei-p8-lite.cc
index 84664fb..776084f 100644
--- a/test/mock/huawei-p8-lite.cc
+++ b/test/mock/huawei-p8-lite.cc
@@ -267,14 +267,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-450",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -645,7 +637,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-450 MP");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/huawei-p9-lite.cc b/test/mock/huawei-p9-lite.cc
index f0332af..068ae73 100644
--- a/test/mock/huawei-p9-lite.cc
+++ b/test/mock/huawei-p9-lite.cc
@@ -300,14 +300,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T830",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -678,7 +670,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T830");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/iconia-one-10.cc b/test/mock/iconia-one-10.cc
index ab01658..29e5abb 100644
--- a/test/mock/iconia-one-10.cc
+++ b/test/mock/iconia-one-10.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR Rogue GE8300",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -584,7 +576,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("PowerVR Rogue GE8300");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/leagoo-t5c.cc b/test/mock/leagoo-t5c.cc
index 4893899..f39e178 100644
--- a/test/mock/leagoo-t5c.cc
+++ b/test/mock/leagoo-t5c.cc
@@ -218,14 +218,6 @@ TEST(PACKAGES, DISABLED_name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T820",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -693,9 +685,6 @@ TEST(L4, none) {
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 	cpuinfo_mock_set_cpuid(cpuid_dump, sizeof(cpuid_dump) / sizeof(cpuinfo_mock_cpuid));
-#ifdef __ANDROID__
-	cpuinfo_mock_gl_renderer("Mali-T820");
-#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/mock/lenovo-a6600-plus.cc b/test/mock/lenovo-a6600-plus.cc
index b07df25..976604b 100644
--- a/test/mock/lenovo-a6600-plus.cc
+++ b/test/mock/lenovo-a6600-plus.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T720",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -554,7 +546,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T720");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/lenovo-vibe-x2.cc b/test/mock/lenovo-vibe-x2.cc
index d5e9e45..b22f4e6 100644
--- a/test/mock/lenovo-vibe-x2.cc
+++ b/test/mock/lenovo-vibe-x2.cc
@@ -321,14 +321,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR Rogue G6200",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -708,7 +700,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("PowerVR Rogue G6200");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/lg-k10-eu.cc b/test/mock/lg-k10-eu.cc
index 9392f6d..258a6a1 100644
--- a/test/mock/lg-k10-eu.cc
+++ b/test/mock/lg-k10-eu.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 306",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 306");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/lg-optimus-g-pro.cc b/test/mock/lg-optimus-g-pro.cc
index b78785f..f7a4bb8 100644
--- a/test/mock/lg-optimus-g-pro.cc
+++ b/test/mock/lg-optimus-g-pro.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 320",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -555,7 +547,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 320");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/meizu-pro-6.cc b/test/mock/meizu-pro-6.cc
index 7bed744..022ae29 100644
--- a/test/mock/meizu-pro-6.cc
+++ b/test/mock/meizu-pro-6.cc
@@ -395,14 +395,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T880",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -853,7 +845,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T880");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/meizu-pro-6s.cc b/test/mock/meizu-pro-6s.cc
index 6184c64..8a3855e 100644
--- a/test/mock/meizu-pro-6s.cc
+++ b/test/mock/meizu-pro-6s.cc
@@ -395,14 +395,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T880",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -853,7 +845,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T880");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/meizu-pro-7-plus.cc b/test/mock/meizu-pro-7-plus.cc
index c690208..8e59f36 100644
--- a/test/mock/meizu-pro-7-plus.cc
+++ b/test/mock/meizu-pro-7-plus.cc
@@ -403,14 +403,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR Rogue GT7400+",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -869,7 +861,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("PowerVR Rogue Marlowe");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/memo-pad-7.cc b/test/mock/memo-pad-7.cc
index 2cef20b..b72431a 100644
--- a/test/mock/memo-pad-7.cc
+++ b/test/mock/memo-pad-7.cc
@@ -218,14 +218,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Intel Gen 7",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -693,9 +685,6 @@ TEST(L4, none) {
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 	cpuinfo_mock_set_cpuid(cpuid_dump, sizeof(cpuid_dump) / sizeof(cpuinfo_mock_cpuid));
-#ifdef __ANDROID__
-	cpuinfo_mock_gl_renderer("Intel(R) HD Graphics for BayTrail");
-#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/mock/moto-e-gen1.cc b/test/mock/moto-e-gen1.cc
index d4853d5..740d48b 100644
--- a/test/mock/moto-e-gen1.cc
+++ b/test/mock/moto-e-gen1.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 305",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 305");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/moto-g-gen1.cc b/test/mock/moto-g-gen1.cc
index cee88c4..c37a6ba 100644
--- a/test/mock/moto-g-gen1.cc
+++ b/test/mock/moto-g-gen1.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 305",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 305");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/moto-g-gen2.cc b/test/mock/moto-g-gen2.cc
index 03ba04a..be61a4c 100644
--- a/test/mock/moto-g-gen2.cc
+++ b/test/mock/moto-g-gen2.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 305",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 305");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/moto-g-gen3.cc b/test/mock/moto-g-gen3.cc
index 602f6e1..c8741db 100644
--- a/test/mock/moto-g-gen3.cc
+++ b/test/mock/moto-g-gen3.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 306",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 306");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/moto-g-gen4.cc b/test/mock/moto-g-gen4.cc
index f325f7e..c60b8ad 100644
--- a/test/mock/moto-g-gen4.cc
+++ b/test/mock/moto-g-gen4.cc
@@ -280,14 +280,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 405",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -662,7 +654,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 405");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/moto-g-gen5.cc b/test/mock/moto-g-gen5.cc
index c7c079c..168a6a9 100644
--- a/test/mock/moto-g-gen5.cc
+++ b/test/mock/moto-g-gen5.cc
@@ -293,14 +293,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 505",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -648,7 +640,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 505");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/nexus-s.cc b/test/mock/nexus-s.cc
index d841acd..2a162fb 100644
--- a/test/mock/nexus-s.cc
+++ b/test/mock/nexus-s.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR SGX540",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -551,7 +543,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("PowerVR SGX 540");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/nexus10.cc b/test/mock/nexus10.cc
index 86ec36c..31d4d6b 100644
--- a/test/mock/nexus10.cc
+++ b/test/mock/nexus10.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T604",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T604");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/nexus4.cc b/test/mock/nexus4.cc
index 0aa3974..2baf5c2 100644
--- a/test/mock/nexus4.cc
+++ b/test/mock/nexus4.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 320",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 320");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/nexus5x.cc b/test/mock/nexus5x.cc
index ce6e029..70ee102 100644
--- a/test/mock/nexus5x.cc
+++ b/test/mock/nexus5x.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 418",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -765,7 +757,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 418");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/nexus6.cc b/test/mock/nexus6.cc
index e53d2dd..c2e82c6 100644
--- a/test/mock/nexus6.cc
+++ b/test/mock/nexus6.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 420",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 420");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/nexus6p.cc b/test/mock/nexus6p.cc
index 3e44545..e73269a 100644
--- a/test/mock/nexus6p.cc
+++ b/test/mock/nexus6p.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 430",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -771,7 +763,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 430");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/nexus9.cc b/test/mock/nexus9.cc
index 67d56ec..b40aaf9 100644
--- a/test/mock/nexus9.cc
+++ b/test/mock/nexus9.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Nvidia Tegra K1",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -584,7 +576,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("NVIDIA Tegra");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/oneplus-3t.cc b/test/mock/oneplus-3t.cc
index 645cbd0..a80d767 100644
--- a/test/mock/oneplus-3t.cc
+++ b/test/mock/oneplus-3t.cc
@@ -296,14 +296,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 530",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -681,7 +673,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 530");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/oneplus-5.cc b/test/mock/oneplus-5.cc
index b2c9f92..b540fc9 100644
--- a/test/mock/oneplus-5.cc
+++ b/test/mock/oneplus-5.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 540",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -784,7 +776,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 540");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/oneplus-5t.cc b/test/mock/oneplus-5t.cc
index 5983f63..70ebfea 100644
--- a/test/mock/oneplus-5t.cc
+++ b/test/mock/oneplus-5t.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 540",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -784,7 +776,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 540");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/oppo-a37.cc b/test/mock/oppo-a37.cc
index 1beec85..283d09a 100644
--- a/test/mock/oppo-a37.cc
+++ b/test/mock/oppo-a37.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 306",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -588,7 +580,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 306");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/oppo-r15.cc b/test/mock/oppo-r15.cc
index a9a5690..383241f 100644
--- a/test/mock/oppo-r15.cc
+++ b/test/mock/oppo-r15.cc
@@ -320,14 +320,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-G72",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -764,7 +756,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-G72");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/oppo-r9.cc b/test/mock/oppo-r9.cc
index dfefa57..8736385 100644
--- a/test/mock/oppo-r9.cc
+++ b/test/mock/oppo-r9.cc
@@ -300,14 +300,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T860",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -698,7 +690,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T860");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/padcod-10.1.cc b/test/mock/padcod-10.1.cc
index 4c59d07..3fe01cb 100644
--- a/test/mock/padcod-10.1.cc
+++ b/test/mock/padcod-10.1.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-400",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -553,7 +545,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-400 MP");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/pixel-2-xl.cc b/test/mock/pixel-2-xl.cc
index 23bfb15..04cacac 100644
--- a/test/mock/pixel-2-xl.cc
+++ b/test/mock/pixel-2-xl.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 540",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -784,7 +776,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 540");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/pixel-c.cc b/test/mock/pixel-c.cc
index 07e7a0d..fa816c1 100644
--- a/test/mock/pixel-c.cc
+++ b/test/mock/pixel-c.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Nvidia Tegra X1",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -584,7 +576,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("NVIDIA Tegra");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/pixel-xl.cc b/test/mock/pixel-xl.cc
index 49a443b..189ef44 100644
--- a/test/mock/pixel-xl.cc
+++ b/test/mock/pixel-xl.cc
@@ -296,14 +296,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 530",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -681,7 +673,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 530");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/pixel.cc b/test/mock/pixel.cc
index f2c03b6..66c2e05 100644
--- a/test/mock/pixel.cc
+++ b/test/mock/pixel.cc
@@ -296,14 +296,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 530",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -681,7 +673,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 530");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/xiaomi-mi-5c.cc b/test/mock/xiaomi-mi-5c.cc
index cf435cf..29dbf27 100644
--- a/test/mock/xiaomi-mi-5c.cc
+++ b/test/mock/xiaomi-mi-5c.cc
@@ -300,14 +300,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T860",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -678,7 +670,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T860");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/xiaomi-redmi-2a.cc b/test/mock/xiaomi-redmi-2a.cc
index a60d4a3..40eef34 100644
--- a/test/mock/xiaomi-redmi-2a.cc
+++ b/test/mock/xiaomi-redmi-2a.cc
@@ -272,14 +272,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T622",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -626,7 +618,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T622");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/xiaomi-redmi-note-3.cc b/test/mock/xiaomi-redmi-note-3.cc
index 4cb0550..00937bc 100644
--- a/test/mock/xiaomi-redmi-note-3.cc
+++ b/test/mock/xiaomi-redmi-note-3.cc
@@ -340,14 +340,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 510",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -765,7 +757,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 510");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/xiaomi-redmi-note-4.cc b/test/mock/xiaomi-redmi-note-4.cc
index dc4f1de..faee5c5 100644
--- a/test/mock/xiaomi-redmi-note-4.cc
+++ b/test/mock/xiaomi-redmi-note-4.cc
@@ -280,14 +280,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 506",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -665,7 +657,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 506");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/xperia-c4-dual.cc b/test/mock/xperia-c4-dual.cc
index a2918f0..9203fb1 100644
--- a/test/mock/xperia-c4-dual.cc
+++ b/test/mock/xperia-c4-dual.cc
@@ -280,14 +280,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("ARM Mali-T760",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -678,7 +670,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Mali-T760");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/xperia-sl.cc b/test/mock/xperia-sl.cc
index 5a3cd73..28ec108 100644
--- a/test/mock/xperia-sl.cc
+++ b/test/mock/xperia-sl.cc
@@ -214,14 +214,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("Qualcomm Adreno 220",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -555,7 +547,6 @@ int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 #ifdef __ANDROID__
 	cpuinfo_mock_android_properties(properties);
-	cpuinfo_mock_gl_renderer("Adreno (TM) 220");
 #endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/test/mock/zenfone-2.cc b/test/mock/zenfone-2.cc
index 53c5ef6..62c43a8 100644
--- a/test/mock/zenfone-2.cc
+++ b/test/mock/zenfone-2.cc
@@ -218,14 +218,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR Rogue G6430",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -693,9 +685,6 @@ TEST(L4, none) {
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 	cpuinfo_mock_set_cpuid(cpuid_dump, sizeof(cpuid_dump) / sizeof(cpuinfo_mock_cpuid));
-#ifdef __ANDROID__
-	cpuinfo_mock_gl_renderer("PowerVR Rogue G6430");
-#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/mock/zenfone-2e.cc b/test/mock/zenfone-2e.cc
index decd278..057c069 100644
--- a/test/mock/zenfone-2e.cc
+++ b/test/mock/zenfone-2e.cc
@@ -218,14 +218,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR SGX544",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -693,9 +685,6 @@ TEST(L4, none) {
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 	cpuinfo_mock_set_cpuid(cpuid_dump, sizeof(cpuid_dump) / sizeof(cpuinfo_mock_cpuid));
-#ifdef __ANDROID__
-	cpuinfo_mock_gl_renderer("PowerVR SGX 544MP2");
-#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/mock/zenfone-c.cc b/test/mock/zenfone-c.cc
index 9a21e42..79ff72e 100644
--- a/test/mock/zenfone-c.cc
+++ b/test/mock/zenfone-c.cc
@@ -218,14 +218,6 @@ TEST(PACKAGES, name) {
 	}
 }
 
-TEST(PACKAGES, gpu_name) {
-	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
-		ASSERT_EQ("PowerVR SGX544",
-			std::string(cpuinfo_get_package(i)->gpu_name,
-				strnlen(cpuinfo_get_package(i)->gpu_name, CPUINFO_GPU_NAME_MAX)));
-	}
-}
-
 TEST(PACKAGES, processor_start) {
 	for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
 		ASSERT_EQ(0, cpuinfo_get_package(i)->processor_start);
@@ -693,9 +685,6 @@ TEST(L4, none) {
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
 	cpuinfo_mock_set_cpuid(cpuid_dump, sizeof(cpuid_dump) / sizeof(cpuinfo_mock_cpuid));
-#ifdef __ANDROID__
-	cpuinfo_mock_gl_renderer("PowerVR SGX 544MP2");
-#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();