diff --git a/conformance/chaos/actor.go b/conformance/chaos/actor.go
index f10c135e0..ed7a230c7 100644
--- a/conformance/chaos/actor.go
+++ b/conformance/chaos/actor.go
@@ -8,7 +8,8 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/runtime"
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
 	"github.com/ipfs/go-cid"
-	"github.com/whyrusleeping/cbor-gen"
+
+	typegen "github.com/whyrusleeping/cbor-gen"
 )
 
 //go:generate go run ./gen
diff --git a/conformance/runner_test.go b/conformance/runner_test.go
index a57458dcb..cc7ef6b3d 100644
--- a/conformance/runner_test.go
+++ b/conformance/runner_test.go
@@ -20,8 +20,8 @@ import (
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
-	"github.com/ipfs/go-ipfs-exchange-offline"
-	"github.com/ipfs/go-ipld-format"
+	offline "github.com/ipfs/go-ipfs-exchange-offline"
+	format "github.com/ipfs/go-ipld-format"
 	"github.com/ipfs/go-merkledag"
 
 	"github.com/filecoin-project/lotus/chain/types"