diff --git a/expression_test.go b/expression_test.go
index 75c4cf43..6af030c0 100644
--- a/expression_test.go
+++ b/expression_test.go
@@ -508,9 +508,14 @@ var _ = gg.Describe("Expression Filters", func() {
 		var _ = gg.Context("Record Ops", func() {
 
 			gg.It("ExpRecordSize must work", func() {
+				if *dbaas {
+					gg.Skip("Not supported in DBAAS environment")
+				}
+
 				if serverIsOlderThan("7") {
-					return
+					gg.Skip("Not supported servers before v7")
 				}
+
 				// storage-engine could be memory for which deviceSize() returns zero.
 				// This just tests that the expression was sent correctly
 				// because all device sizes are effectively allowed.
diff --git a/load_test.go b/load_test.go
index 0552e2f3..a79b126e 100644
--- a/load_test.go
+++ b/load_test.go
@@ -33,6 +33,12 @@ func init() {
 
 // ALL tests are isolated by SetName and Key, which are 50 random characters
 var _ = gg.Describe("Aerospike load tests", func() {
+	gg.BeforeEach(func() {
+		if *dbaas {
+			gg.Skip("Not supported in DBAAS environment")
+		}
+	})
+
 	gg.Describe("Single long random string test", func() {
 		var ns = *namespace
 		var set = "load"
diff --git a/random_operation_test.go b/random_operation_test.go
index c3bfa374..450c384b 100644
--- a/random_operation_test.go
+++ b/random_operation_test.go
@@ -30,6 +30,12 @@ const RANDOM_OPS_RUNS = 1000
 // ALL tests are isolated by SetName and Key, which are 50 random characters
 var _ = gg.Describe("Aerospike", func() {
 
+	gg.BeforeEach(func() {
+		if *dbaas {
+			gg.Skip("Not supported in DBAAS environment")
+		}
+	})
+
 	gg.Describe("Random Data Operations", func() {
 		// connection data
 		var err error