diff --git a/CHANGES.txt b/CHANGES.txt
index e2b6d921ed..b237583662 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 Current
+Fixed: GITHUB-2780: Use SpotBugs instead of abandoned FindBugs
 
 7.6.1
 Fixed: GITHUB-2761: Exception: ERROR java.nio.file.NoSuchFileException: /tmp/testngXmlPathInJar-15086412835569336174 (Krishnan Mahadevan)
diff --git a/testng-core-api/testng-core-api-build.gradle.kts b/testng-core-api/testng-core-api-build.gradle.kts
index 3db3731792..403e316889 100644
--- a/testng-core-api/testng-core-api-build.gradle.kts
+++ b/testng-core-api/testng-core-api-build.gradle.kts
@@ -10,7 +10,7 @@ java {
 
 dependencies {
     api(projects.testngCollections)
-    api("com.google.code.findbugs:jsr305:_")
+    api("com.github.spotbugs:spotbugs:_")
     "guiceApi"(platform("com.google.inject:guice-bom:_"))
     "guiceApi"("com.google.inject:guice")
 
diff --git a/testng-core/testng-core-build.gradle.kts b/testng-core/testng-core-build.gradle.kts
index 6d91da6fa4..57c5220e10 100644
--- a/testng-core/testng-core-build.gradle.kts
+++ b/testng-core/testng-core-build.gradle.kts
@@ -25,7 +25,7 @@ java {
 dependencies {
     api(projects.testngCoreApi)
     // Annotations have to be available on the compile classpath for the proper compilation
-    api("com.google.code.findbugs:jsr305:_")
+    api("com.github.spotbugs:spotbugs:_")
     api("com.beust:jcommander:_")
 
     "guiceApi"(platform("com.google.inject:guice-bom:_"))
diff --git a/versions.properties b/versions.properties
index cdc65bb528..a6b4956802 100644
--- a/versions.properties
+++ b/versions.properties
@@ -45,7 +45,7 @@ version.ch.qos.logback..logback-core=1.2.11
 
 version.com.beust..jcommander=1.82
 
-version.com.google.code.findbugs..jsr305=3.0.2
+version.com.github.spotbugs..spotbugs=4.7.1
 
 version.com.google.inject..guice-bom=5.1.0