diff --git a/.gitignore b/.gitignore
index 37a233e35c0..af8696a0afb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 # Gradle
 /.gradle/
-/buildSrc/.gradle/
+/conventions/.gradle/
+/conventions/.kotlin/
 /perf-tests/.gradle/
-/buildSrc/.kotlin/
 build/
 
 # Intellij
diff --git a/buildSrc/build.gradle.kts b/conventions/build.gradle.kts
similarity index 93%
rename from buildSrc/build.gradle.kts
rename to conventions/build.gradle.kts
index 8d45a8da86b..7765064f984 100644
--- a/buildSrc/build.gradle.kts
+++ b/conventions/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-  `java-gradle-plugin`
   `kotlin-dsl`
   // When updating, update below in dependencies too
   id("com.diffplug.spotless") version "8.2.0"
@@ -22,10 +21,6 @@ repositories {
   gradlePluginPortal()
 }
 
-tasks.withType<Test>().configureEach {
-  useJUnitPlatform()
-}
-
 dependencies {
   implementation(gradleApi())
 
diff --git a/conventions/settings.gradle.kts b/conventions/settings.gradle.kts
new file mode 100644
index 00000000000..559d9de6514
--- /dev/null
+++ b/conventions/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "conventions"
diff --git a/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/ai.errorprone-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts
rename to conventions/src/main/kotlin/ai.errorprone-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts b/conventions/src/main/kotlin/ai.java-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts
rename to conventions/src/main/kotlin/ai.java-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts b/conventions/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
rename to conventions/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.publish-conventions.gradle.kts b/conventions/src/main/kotlin/ai.publish-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.publish-conventions.gradle.kts
rename to conventions/src/main/kotlin/ai.publish-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts b/conventions/src/main/kotlin/ai.sdk-version-file.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts
rename to conventions/src/main/kotlin/ai.sdk-version-file.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.shadow-conventions.gradle.kts b/conventions/src/main/kotlin/ai.shadow-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.shadow-conventions.gradle.kts
rename to conventions/src/main/kotlin/ai.shadow-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.smoke-test-jar.gradle.kts b/conventions/src/main/kotlin/ai.smoke-test-jar.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.smoke-test-jar.gradle.kts
rename to conventions/src/main/kotlin/ai.smoke-test-jar.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.smoke-test-war.gradle.kts b/conventions/src/main/kotlin/ai.smoke-test-war.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.smoke-test-war.gradle.kts
rename to conventions/src/main/kotlin/ai.smoke-test-war.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts b/conventions/src/main/kotlin/ai.smoke-test.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
rename to conventions/src/main/kotlin/ai.smoke-test.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.spotbugs-conventions.gradle.kts b/conventions/src/main/kotlin/ai.spotbugs-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.spotbugs-conventions.gradle.kts
rename to conventions/src/main/kotlin/ai.spotbugs-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/ai.spotless-conventions.gradle.kts b/conventions/src/main/kotlin/ai.spotless-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/ai.spotless-conventions.gradle.kts
rename to conventions/src/main/kotlin/ai.spotless-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/com/microsoft/applicationinsights/gradle/AiSmokeTestExtension.kt b/conventions/src/main/kotlin/com/microsoft/applicationinsights/gradle/AiSmokeTestExtension.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/com/microsoft/applicationinsights/gradle/AiSmokeTestExtension.kt
rename to conventions/src/main/kotlin/com/microsoft/applicationinsights/gradle/AiSmokeTestExtension.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2629d08ca1a..2c282aa3af7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 pluginManagement {
+  includeBuild("conventions")
   plugins {
     id("com.github.jk1.dependency-license-report") version "3.0.1"
     id("me.champeau.jmh") version "0.7.3"