diff --git a/go.mod b/go.mod
index b320dfc8f..e197e1d63 100644
--- a/go.mod
+++ b/go.mod
@@ -18,3 +18,5 @@ require (
 	golang.org/x/sys v0.6.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/networkservicemesh/integration-tests => github.com/Nordix/integration-tests v0.0.0-20231018122635-1ce6d4f8175c
diff --git a/go.sum b/go.sum
index ed1c73df8..97e29db39 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+github.com/Nordix/integration-tests v0.0.0-20231018122635-1ce6d4f8175c h1:LRWxZFOrPQ6u6SKo2jC8nn+89mQuobwXWUqbuvKLLx0=
+github.com/Nordix/integration-tests v0.0.0-20231018122635-1ce6d4f8175c/go.mod h1:o3+iZ6iQvk2ukrAxQhaDOXUPhhQRW4O9BMi6YolZ4pI=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -14,8 +16,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 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/networkservicemesh/integration-tests v0.0.0-20230829165423-6b7f96e092e3 h1:2qADQ2rgcw8Tsh5WMz8mJ7sAREk20iym5F+fa62UEeE=
-github.com/networkservicemesh/integration-tests v0.0.0-20230829165423-6b7f96e092e3/go.mod h1:o3+iZ6iQvk2ukrAxQhaDOXUPhhQRW4O9BMi6YolZ4pI=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/tests_single/ovs_test.go b/tests_single/ovs_test.go
new file mode 100644
index 000000000..e5cde4f80
--- /dev/null
+++ b/tests_single/ovs_test.go
@@ -0,0 +1,47 @@
+// Copyright (c) 2023 Nordix Foundation.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at:
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package single
+
+import (
+	"flag"
+	"testing"
+
+	"github.com/networkservicemesh/integration-tests/extensions/parallel"
+	"github.com/networkservicemesh/integration-tests/suites/ovs"
+)
+
+var smartVFFlag = flag.Bool("smart", false, "selects smartVF tests")
+
+// Disabled tests:
+// SmartVF to SmartVF Connection - ../use-cases/SmartVF2SmartVF
+type kindOvsSuite struct {
+	ovs.Suite
+}
+
+func (s *kindOvsSuite) BeforeTest(suiteName, testName string) {
+	if testName == "TestSmartVF2SmartVF" {
+		s.T().Skip()
+	}
+}
+
+func TestRunOvsSuite(t *testing.T) {
+	if !*smartVFFlag {
+		parallel.Run(t, new(kindOvsSuite), "TestSmartVF2SmartVF")
+	} else {
+		parallel.Run(t, new(ovs.Suite))
+	}
+}