diff --git a/Makefile b/Makefile
index 77d8b32..4e5290d 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ bench:
 lint: setup
 	@$(GOBIN)/golint -set_exit_status -min_confidence 0.9 $(path) $(args)
 	@go vet $(path) $(args)
+	@make -C benchmarks
 	@echo "Golint & Go Vet found no problems on your code!"
 
 mock: setup
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
new file mode 100644
index 0000000..6f20d82
--- /dev/null
+++ b/benchmarks/Makefile
@@ -0,0 +1,6 @@
+
+GOBIN=$(shell go env GOPATH)/bin
+
+lint:
+	@$(GOBIN)/golint -set_exit_status -min_confidence 0.9 ./...
+	@go vet ./...
diff --git a/benchmarks/benchmarks_test.go b/benchmarks/benchmarks_test.go
index 8d6dda7..7318ff2 100644
--- a/benchmarks/benchmarks_test.go
+++ b/benchmarks/benchmarks_test.go
@@ -31,9 +31,12 @@ func BenchmarkInsert(b *testing.B) {
 	}
 
 	b.Run("ksql/sql-adapter", func(b *testing.B) {
-		ksqlDB, err := ksql.New(driver, connStr, ksql.Config{
-			MaxOpenConns: 1,
-		})
+		db, err := sql.Open(driver, connStr)
+		if err != nil {
+			b.Fatalf("error connecting to database: %s", err)
+		}
+		db.SetMaxOpenConns(1)
+		ksqlDB, err := ksql.NewWithAdapter(ksql.NewSQLAdapter(db), driver)
 		if err != nil {
 			b.Fatalf("error creating ksql client: %s", err)
 		}
@@ -284,9 +287,12 @@ func BenchmarkQuery(b *testing.B) {
 	}
 
 	b.Run("ksql/sql-adapter", func(b *testing.B) {
-		ksqlDB, err := ksql.New(driver, connStr, ksql.Config{
-			MaxOpenConns: 1,
-		})
+		db, err := sql.Open(driver, connStr)
+		if err != nil {
+			b.Fatalf("error connecting to database: %s", err)
+		}
+		db.SetMaxOpenConns(1)
+		ksqlDB, err := ksql.NewWithAdapter(ksql.NewSQLAdapter(db), driver)
 		if err != nil {
 			b.Fatalf("error creating ksql client: %s", err)
 		}