diff --git a/db_test.go b/db_test.go
index c19eadd33..0dbb97cf6 100644
--- a/db_test.go
+++ b/db_test.go
@@ -26,7 +26,6 @@ import (
 	"log"
 	"math"
 	"math/rand"
-	"net/http"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -1798,12 +1797,7 @@ func TestForceFlushMemtable(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	// call flag.Parse() here if TestMain uses flags
-	go func() {
-		if err := http.ListenAndServe("localhost:8080", nil); err != nil {
-			panic("Unable to open http port at 8080")
-		}
-	}()
+	flag.Parse()
 	os.Exit(m.Run())
 }
 
diff --git a/test.sh b/test.sh
index 5b14bfd8f..cebb654d9 100755
--- a/test.sh
+++ b/test.sh
@@ -2,30 +2,45 @@
 
 set -e
 
+go version
+
+packages=$(go list ./... | grep github.com/dgraph-io/badger/)
+
+if [[ ! -z "$TEAMCITY_VERSION" ]]; then
+  export GOFLAGS="-json"
+fi
+
 # Ensure that we can compile the binary.
 pushd badger
 go build -v .
 popd
 
 # Run the memory intensive tests first.
-go test -v --manual=true -run='TestBigKeyValuePairs$'
-go test -v --manual=true -run='TestPushValueLogLimit'
+go test -v -run='TestBigKeyValuePairs$' --manual=true
+go test -v -run='TestPushValueLogLimit' --manual=true
 
 # Run the special Truncate test.
 rm -rf p
-go test -v --manual=true -run='TestTruncateVlogNoClose$' .
+go test -v -run='TestTruncateVlogNoClose$' --manual=true
 truncate --size=4096 p/000000.vlog
-go test -v --manual=true -run='TestTruncateVlogNoClose2$' .
-go test -v --manual=true -run='TestTruncateVlogNoClose3$' .
+go test -v -run='TestTruncateVlogNoClose2$' --manual=true
+go test -v -run='TestTruncateVlogNoClose3$' --manual=true
 rm -rf p
 
 # Then the normal tests.
+echo
+echo "==> Starting test for table, skl and y package"
+go test -v -race github.com/dgraph-io/badger/v2/skl
+# Run test for all package except the top level package. The top level package support the
+# `vlog_mmap` flag which rest of the packages don't support.
+go test -v -race $packages
+
 echo
 echo "==> Starting tests with value log mmapped..."
-sleep 5
-go test -v --vlog_mmap=true -race ./...
+# Run top level package tests with mmap flag.
+go test -v -race github.com/dgraph-io/badger/v2 --vlog_mmap=true
 
 echo
 echo "==> Starting tests with value log not mmapped..."
-sleep 5
-go test -v --vlog_mmap=false -race ./...
+go test -v -race github.com/dgraph-io/badger/v2 --vlog_mmap=false
+