diff --git a/.circleci/config.yml b/.circleci/config.yml
index 71bdeac..c78c0e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,7 +38,7 @@ commands:
     description: "Run godog"
     steps:
       - run: go install ./cmd/godog
-      - run: godog -f progress
+      - run: godog -f progress --strict
   go_test:
     description: "Run go test"
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cd6985..f7a1ccb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,13 +14,18 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 
 ### Changed
 
+- Run godog features in CircleCI in strict mode ([jaysonesmith])
+- Removed TestMain call in `suite_test.go` for CI. ([jaysonesmith])
+
 ### Deprecated
 
 ### Removed
 
 ### Fixed
+
 - Fixed the time attributes in the JUnit formatter. ([232](https://github.com/cucumber/godog/pull/232) [lonnblad])
 - Re enable custom formatters. ([238](https://github.com/cucumber/godog/pull/238) [ericmcbride])
+- Added back suite_test.go ([jaysonesmith])
 
 ## [0.8.1]
 
diff --git a/README.md b/README.md
index 9a831fd..72f7dc8 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@
 
 # Godog
 
-[🚨🚨🚨 Godog is looking for new maintainers 🚨🚨🚨](https://github.com/cucumber/godog/issues/207)
-
 <p align="center"><img src="/logo.png" alt="Godog logo" style="width:250px;" /></p>
 
 **The API is likely to change a few times before we reach 1.0.0**
diff --git a/builder_go110.go b/builder_go110.go
index cf8f0cb..9702a29 100644
--- a/builder_go110.go
+++ b/builder_go110.go
@@ -238,6 +238,9 @@ func maybeVendoredGodog() *build.Package {
 	return nil
 }
 
+func normaliseLocalImportPath(dir string) string {
+	return path.Join("_", strings.Map(makeImportValid, filepath.ToSlash(dir)))
+}
 func importPackage(dir string) *build.Package {
 	pkg, _ := build.ImportDir(dir, 0)
 
@@ -245,7 +248,7 @@ func importPackage(dir string) *build.Package {
 	// taken from go source code
 	// see: https://github.com/golang/go/blob/go1.7rc5/src/cmd/go/pkg.go#L279
 	if pkg != nil && pkg.ImportPath == "." {
-		pkg.ImportPath = path.Join("_", strings.Map(makeImportValid, filepath.ToSlash(dir)))
+		pkg.ImportPath = normaliseLocalImportPath(dir)
 	}
 
 	return pkg
@@ -376,7 +379,7 @@ func parseImport(rawPath, rootPath string) string {
 		return rawPath
 	}
 	// Concatenates the module path with the current sub-folders if needed
-	return mod.Path + filepath.ToSlash(strings.TrimPrefix(strings.TrimPrefix(rawPath, "_"), mod.Dir))
+	return mod.Path + filepath.ToSlash(strings.TrimPrefix(rawPath, normaliseLocalImportPath(mod.Dir)))
 }
 
 // processPackageTestFiles runs through ast of each test
diff --git a/suite_test.go b/suite_test.go
new file mode 100644
index 0000000..9d2f71d
--- /dev/null
+++ b/suite_test.go
@@ -0,0 +1,6 @@
+package godog
+
+// needed in order to use godog cli
+func GodogContext(s *Suite) {
+	SuiteContext(s)
+}