3 files changed, 42 insertions, 8 deletions
diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go
index ad43f9d032e..f4bee5e312b 100644
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -33,7 +33,7 @@ func init() {
 		HttpInvalidContentLengthTest, HttpInvalidTargetSyntaxTest, HttpStaticPathSanitizationTest, HttpUriDecodeTest,
 		HttpHeadersTest, HttpStaticFileHandlerTest, HttpStaticFileHandlerDefaultMaxAgeTest, HttpClientTest,
 		HttpClientErrRespTest, HttpClientPostFormTest, HttpClientGet128kbResponseTest, HttpClientGetResponseBodyTest,
-		HttpClientGetNoResponseBodyTest, HttpClientPostFileTest, HttpClientPostFilePtrTest, HttpUnitTest,
+		HttpClientGetNoResponseBodyTest, HttpClientPostFileTest, HttpClientPostFilePtrTest,
 		HttpRequestLineTest, HttpClientGetTimeout, HttpStaticFileHandlerWrkTest, HttpStaticUrlHandlerWrkTest, HttpConnTimeoutTest,
 		HttpClientGetRepeatTest, HttpClientPostRepeatTest, HttpIgnoreH2UpgradeTest, HttpInvalidAuthorityFormUriTest, HttpHeaderErrorConnectionDropTest)
 	RegisterNoTopoSoloTests(HttpStaticPromTest, HttpGetTpsTest, HttpGetTpsInterruptModeTest, PromConcurrentConnectionsTest,
@@ -547,13 +547,6 @@ func HttpClientPostFilePtrTest(s *NoTopoSuite) {
 	httpClientPostFile(s, true, 131072)
 }
 
-func HttpUnitTest(s *NoTopoSuite) {
-	vpp := s.Containers.Vpp.VppInstance
-	o := vpp.Vppctl("test http all")
-	s.Log(o)
-	s.AssertContains(o, "SUCCESS")
-}
-
 func HttpStaticPromTest(s *NoTopoSuite) {
 	query := "stats.prom"
 	vpp := s.Containers.Vpp.VppInstance
diff --git a/extras/hs-test/infra/hst_suite.go b/extras/hs-test/infra/hst_suite.go
index d44b76f3e1f..5ef4883ebdb 100644
--- a/extras/hs-test/infra/hst_suite.go
+++ b/extras/hs-test/infra/hst_suite.go
@@ -248,6 +248,12 @@ func (s *HstSuite) SkipIfUnconfiguring() {
 	}
 }
 
+func (s *HstSuite) SkipIfNotCoverage() {
+	if !s.CoverageRun {
+		s.Skip("skipping, not a coverage run")
+	}
+}
+
 func (s *HstSuite) SetupTest() {
 	testCounterFunc()
 	s.Log("[* TEST SETUP]")
diff --git a/extras/hs-test/unittests_test.go b/extras/hs-test/unittests_test.go
new file mode 100644
index 00000000000..26faca572b8
--- /dev/null
+++ b/extras/hs-test/unittests_test.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	. "fd.io/hs-test/infra"
+)
+
+func init() {
+	RegisterNoTopoTests(HttpUnitTest, TcpUnitTest, SvmUnitTest, SessionUnitTest)
+}
+
+func runUnitTest(s *NoTopoSuite, vppCmd string) {
+	vpp := s.Containers.Vpp.VppInstance
+	o := vpp.Vppctl(vppCmd)
+	s.Log(o)
+	s.AssertContains(o, "SUCCESS")
+}
+
+func HttpUnitTest(s *NoTopoSuite) {
+	runUnitTest(s, "test http all")
+}
+
+func TcpUnitTest(s *NoTopoSuite) {
+	s.SkipIfNotCoverage()
+	runUnitTest(s, "test tcp all")
+}
+
+func SvmUnitTest(s *NoTopoSuite) {
+	s.SkipIfNotCoverage()
+	runUnitTest(s, "test svm fifo all")
+}
+
+func SessionUnitTest(s *NoTopoSuite) {
+	s.SkipIfNotCoverage()
+	runUnitTest(s, "test session all")
+}