diff --git a/src/main/groovy/com/google/protobuf/gradle/Utils.groovy b/src/main/groovy/com/google/protobuf/gradle/Utils.groovy
index 05e7ea9b..ac440d22 100644
--- a/src/main/groovy/com/google/protobuf/gradle/Utils.groovy
+++ b/src/main/groovy/com/google/protobuf/gradle/Utils.groovy
@@ -157,9 +157,6 @@ class Utils {
         entry.entryAttributes.put("optional", "true")
         entry.entryAttributes.put("ignore_optional_problems", "true")
 
-        entry.entryAttributes.put("gradle_scope", isTest ? "test" : "main")
-        entry.entryAttributes.put("gradle_used_by_scope", isTest ? "test" : "main,test")
-
         // this attribute is optional, but it could be useful for IDEs to recognize that it is
         // generated source folder from protobuf, thus providing some support for that.
         // e.g. Hint user to run generate tasks if the folder is empty or does not exist.
diff --git a/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy b/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy
index 1acc1f13..6f23f18b 100644
--- a/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy
+++ b/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy
@@ -442,9 +442,9 @@ class ProtobufJavaPluginTest extends Specification {
       if (path.startsWith("build/generated/source/proto")) {
         if (path.contains("test")) {
           // test source path has one more attribute: ["test"="true"]
-          assert it.attributes.attribute.size() == 6
+          assert it.attributes.attribute.size() == 4
         } else {
-          assert it.attributes.attribute.size() == 5
+          assert it.attributes.attribute.size() == 3
         }
       }
     }