diff --git a/platforms/opencv/camera_driver_test.go b/platforms/opencv/camera_driver_test.go
index 53e7cba7..7573495a 100644
--- a/platforms/opencv/camera_driver_test.go
+++ b/platforms/opencv/camera_driver_test.go
@@ -1,26 +1,27 @@
 package opencv
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/hybridgroup/gobot"
+	"testing"
 )
 
-var _ = Describe("Camera", func() {
-	var (
-		c *CameraDriver
-	)
+var c *CameraDriver
 
-	BeforeEach(func() {
-		c = NewCameraDriver("bot", 0)
-	})
+func init() {
+	c = NewCameraDriver("bot", 0)
+}
 
-	PIt("Must be able to Start", func() {
-		Expect(c.Start()).To(Equal(true))
-	})
-	PIt("Must be able to Init", func() {
-		Expect(c.Init()).To(Equal(true))
-	})
-	PIt("Must be able to Halt", func() {
-		Expect(c.Halt()).To(Equal(true))
-	})
-})
+func TestCameraStart(t *testing.T) {
+	t.SkipNow()
+	gobot.Expect(t, c.Start(), true)
+}
+
+func TestCameraHalt(t *testing.T) {
+	t.SkipNow()
+	gobot.Expect(t, c.Halt(), true)
+}
+
+func TestCameraInit(t *testing.T) {
+	t.SkipNow()
+	gobot.Expect(t, c.Init(), true)
+}
diff --git a/platforms/opencv/gobot-opencv_suite_test.go b/platforms/opencv/gobot-opencv_suite_test.go
deleted file mode 100644
index 41936d41..00000000
--- a/platforms/opencv/gobot-opencv_suite_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package opencv
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"testing"
-)
-
-func TestGobotOpencv(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Gobot-Opencv Suite")
-}
diff --git a/platforms/opencv/window_driver_test.go b/platforms/opencv/window_driver_test.go
index c7c5268a..9ac13836 100644
--- a/platforms/opencv/window_driver_test.go
+++ b/platforms/opencv/window_driver_test.go
@@ -1,26 +1,27 @@
 package opencv
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/hybridgroup/gobot"
+	"testing"
 )
 
-var _ = Describe("Window", func() {
-	var (
-		w *WindowDriver
-	)
+var w *WindowDriver
 
-	BeforeEach(func() {
-		w = NewWindowDriver("bot")
-	})
+func init() {
+	w = NewWindowDriver("bot")
+}
 
-	PIt("Must be able to Start", func() {
-		Expect(w.Start()).To(Equal(true))
-	})
-	PIt("Must be able to Init", func() {
-		Expect(w.Init()).To(Equal(true))
-	})
-	PIt("Must be able to Halt", func() {
-		Expect(w.Halt()).To(Equal(true))
-	})
-})
+func TestWindowStart(t *testing.T) {
+	t.SkipNow()
+	gobot.Expect(t, w.Start(), true)
+}
+
+func TestWindowHalt(t *testing.T) {
+	t.SkipNow()
+	gobot.Expect(t, w.Halt(), true)
+}
+
+func TestWindowInit(t *testing.T) {
+	t.SkipNow()
+	gobot.Expect(t, w.Init(), true)
+}