diff --git a/go.mod b/go.mod
index 98741b356c..d0f23b3511 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/google/uuid v1.2.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/networkservicemesh/gotestmd v0.0.0-20211116145945-871d2aaf07ab
+	github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c // indirect
diff --git a/go.sum b/go.sum
index 6941b980a2..7152035a57 100644
--- a/go.sum
+++ b/go.sum
@@ -154,8 +154,8 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/networkservicemesh/gotestmd v0.0.0-20211116145945-871d2aaf07ab h1:/dIr8Nky77grI3s9Rc78eFH9M1Svobyj2XJBaKm27ts=
-github.com/networkservicemesh/gotestmd v0.0.0-20211116145945-871d2aaf07ab/go.mod h1:8EWnekTRNX+NxBdTFE24WqUoM7SgJHbiafDBrIIdOmQ=
+github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc h1:1L/OisEFsOyhwaqeJpYmM1nlJ2dBusUMiszPDBlUip0=
+github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc/go.mod h1:8EWnekTRNX+NxBdTFE24WqUoM7SgJHbiafDBrIIdOmQ=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
diff --git a/suites/remotevlan/suite.gen.go b/suites/remotevlan/suite.gen.go
index 37aa92adea..41d3082767 100755
--- a/suites/remotevlan/suite.gen.go
+++ b/suites/remotevlan/suite.gen.go
@@ -42,40 +42,11 @@ func (s *Suite) SetupSuite() {
 	s.RunIncludedSuites()
 }
 func (s *Suite) RunIncludedSuites() {
-	runTest := func(subSuite suite.TestingSuite, suiteName, testName string, subtest func()) {
-		type runner interface {
-			Run(name string, f func()) bool
-		}
-		defer func() {
-			if afterTestSuite, ok := subSuite.(suite.AfterTest); ok {
-				afterTestSuite.AfterTest(suiteName, testName)
-			}
-			if tearDownTestSuite, ok := subSuite.(suite.TearDownTestSuite); ok {
-				tearDownTestSuite.TearDownTest()
-			}
-		}()
-		if setupTestSuite, ok := subSuite.(suite.SetupTestSuite); ok {
-			setupTestSuite.SetupTest()
-		}
-		if beforeTestSuite, ok := subSuite.(suite.BeforeTest); ok {
-			beforeTestSuite.BeforeTest(suiteName, testName)
-		}
-		// Run test
-		subSuite.(runner).Run(testName, subtest)
-	}
 	s.Run("Rvlanovs", func() {
-		s.rvlanovsSuite.SetT(s.T())
-		s.rvlanovsSuite.SetupSuite()
-		runTest(&s.rvlanovsSuite, "Rvlanovs", "TestKernel2RVlanBreakout", s.rvlanovsSuite.TestKernel2RVlanBreakout)
-		runTest(&s.rvlanovsSuite, "Rvlanovs", "TestKernel2RVlanInternal", s.rvlanovsSuite.TestKernel2RVlanInternal)
-		runTest(&s.rvlanovsSuite, "Rvlanovs", "TestKernel2RVlanMultiNS", s.rvlanovsSuite.TestKernel2RVlanMultiNS)
+		suite.Run(s.T(), &s.rvlanovsSuite)
 	})
 	s.Run("Rvlanvpp", func() {
-		s.rvlanvppSuite.SetT(s.T())
-		s.rvlanvppSuite.SetupSuite()
-		runTest(&s.rvlanvppSuite, "Rvlanvpp", "TestKernel2RVlanBreakout", s.rvlanvppSuite.TestKernel2RVlanBreakout)
-		runTest(&s.rvlanvppSuite, "Rvlanvpp", "TestKernel2RVlanInternal", s.rvlanvppSuite.TestKernel2RVlanInternal)
-		runTest(&s.rvlanvppSuite, "Rvlanvpp", "TestKernel2RVlanMultiNS", s.rvlanvppSuite.TestKernel2RVlanMultiNS)
+		suite.Run(s.T(), &s.rvlanvppSuite)
 	})
 }
 func (s *Suite) Test() {}