diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index 10826de2e4..9038c6db99 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -165,12 +165,12 @@ target_link_libraries(lite-test
 add_test(NAME lite-test
   COMMAND lite-test ${protobuf_GTEST_ARGS})
 
-add_custom_target(test
+add_custom_target(full-test
   COMMAND tests
   DEPENDS tests lite-test test_plugin
   WORKING_DIRECTORY ${protobuf_SOURCE_DIR})
 
-add_test(NAME test
+add_test(NAME full-test
   COMMAND tests ${protobuf_GTEST_ARGS})
 
 # For test purposes, remove headers that should already be installed.  This
diff --git a/src/google/protobuf/repeated_field_unittest.cc b/src/google/protobuf/repeated_field_unittest.cc
index 61f69bc0bd..0de0fec869 100644
--- a/src/google/protobuf/repeated_field_unittest.cc
+++ b/src/google/protobuf/repeated_field_unittest.cc
@@ -1386,6 +1386,7 @@ TEST(RepeatedPtrField, ClearedElements) {
   field.Clear();
   EXPECT_EQ(field.ClearedCount(), 2);
 #ifndef PROTOBUF_FUTURE_REMOVE_CLEARED_API
+  PROTOBUF_IGNORE_DEPRECATION_START
   EXPECT_EQ(field.ReleaseCleared(), original);  // Take ownership again.
   EXPECT_EQ(field.ClearedCount(), 1);
   EXPECT_NE(field.Add(), original);
@@ -1397,6 +1398,7 @@ TEST(RepeatedPtrField, ClearedElements) {
   EXPECT_EQ(field.ClearedCount(), 1);
   EXPECT_EQ(field.Add(), original);
   EXPECT_EQ(field.ClearedCount(), 0);
+    PROTOBUF_IGNORE_DEPRECATION_STOP
 #endif  // !PROTOBUF_FUTURE_REMOVE_CLEARED_API
 }