diff --git a/extras/hs-test/infra/cpu.go b/extras/hs-test/infra/cpu.go
index b26a06c..6ba60e5 100644
--- a/extras/hs-test/infra/cpu.go
+++ b/extras/hs-test/infra/cpu.go
@@ -39,6 +39,13 @@
 	// indexes, not actual cores
 	var minCpu, maxCpu int
 
+	// temporary fix for CpuPinningSuite
+	if strings.Contains(CurrentSpecReport().ContainerHierarchyTexts[0], "CpuPinning") {
+		cpuAllocator.maxContainerCount = 1
+	} else {
+		cpuAllocator.maxContainerCount = 4
+	}
+
 	if c.runningInCi {
 		minCpu = ((c.buildNumber) * c.maxContainerCount * nCpus)
 		maxCpu = ((c.buildNumber + 1) * c.maxContainerCount * nCpus) - 1
@@ -130,7 +137,7 @@
 			tmpCpus = iterateAndAppend(third, fourth, tmpCpus)
 
 			// discard cpu 0
-			if tmpCpus[0] == 0 && !*UseCpu0{
+			if tmpCpus[0] == 0 && !*UseCpu0 {
 				tmpCpus = tmpCpus[1:]
 			}