diff --git a/examples/examples_dotnet_test.go b/examples/examples_dotnet_test.go
index 2e2bf820..fc92a36f 100644
--- a/examples/examples_dotnet_test.go
+++ b/examples/examples_dotnet_test.go
@@ -1,4 +1,5 @@
 // Copyright 2016-2017, Pulumi Corporation.  All rights reserved.
+//go:build dotnet || all
 // +build dotnet all
 
 package examples
@@ -10,7 +11,7 @@ import (
 )
 
 func getCsharpBaseOptions(t *testing.T) integration.ProgramTestOptions {
-	base := getBaseOptions()
+	base := getBaseOptions(t)
 	baseCsharp := base.With(integration.ProgramTestOptions{
 		Dependencies: []string{
 			"Pulumi.Aiven",
diff --git a/examples/examples_nodejs_test.go b/examples/examples_nodejs_test.go
index 141591e6..7dbe8c41 100644
--- a/examples/examples_nodejs_test.go
+++ b/examples/examples_nodejs_test.go
@@ -31,7 +31,7 @@ func TestAccPgService(t *testing.T) {
 
 func getJSBaseOptions(t *testing.T) integration.ProgramTestOptions {
 	projectName := getProjectName(t)
-	base := getBaseOptions()
+	base := getBaseOptions(t)
 	baseJS := base.With(integration.ProgramTestOptions{
 		ExpectRefreshChanges: true,
 		Config: map[string]string{
diff --git a/examples/examples_py_test.go b/examples/examples_py_test.go
index cbbdf02b..e8b5ecf5 100644
--- a/examples/examples_py_test.go
+++ b/examples/examples_py_test.go
@@ -1,4 +1,5 @@
 // Copyright 2016-2017, Pulumi Corporation.  All rights reserved.
+//go:build python || all
 // +build python all
 
 package examples
@@ -11,7 +12,7 @@ import (
 )
 
 func getPythonBaseOptions(t *testing.T) integration.ProgramTestOptions {
-	base := getBaseOptions()
+	base := getBaseOptions(t)
 	basePython := base.With(integration.ProgramTestOptions{
 		Dependencies: []string{
 			filepath.Join("..", "sdk", "python", "bin"),
diff --git a/examples/examples_test.go b/examples/examples_test.go
index 05e99ec4..77c1a249 100644
--- a/examples/examples_test.go
+++ b/examples/examples_test.go
@@ -27,7 +27,10 @@ func getCwd(t *testing.T) string {
 	return cwd
 }
 
-func getBaseOptions() integration.ProgramTestOptions {
+func getBaseOptions(t *testing.T) integration.ProgramTestOptions {
+	t.Skip(`Testing for pulumi-aiven needs to be robust to resource leaks (#235).
+               In the past, we have leaked resources here, and continued E2E testing on this provider is not a priority
+	       so we have chosen to discontinue testing pulumi-aiven in CI.`)
 	return integration.ProgramTestOptions{
 		RunUpdateTest: false,
 	}