diff --git a/core/coreapi/coreapi.go b/core/coreapi/coreapi.go
index b927cea59..d5f6a7a3f 100644
--- a/core/coreapi/coreapi.go
+++ b/core/coreapi/coreapi.go
@@ -209,7 +209,6 @@ func (api *CoreAPI) WithOptions(opts ...options.ApiOption) (coreiface.CoreAPI, e
 
 		subApi.peerstore = nil
 		subApi.peerHost = nil
-		subApi.namesys = nil
 		subApi.recordValidator = nil
 
 		subApi.exchange = offlinexch.Exchange(subApi.blockstore)
diff --git a/test/sharness/t0100-name.sh b/test/sharness/t0100-name.sh
index 7a23fd196..e03f1553c 100755
--- a/test/sharness/t0100-name.sh
+++ b/test/sharness/t0100-name.sh
@@ -158,8 +158,42 @@ test_expect_success "'ipfs name publish --help' succeeds" '
   ipfs name publish --help
 '
 
+# test offline resolve
+
+test_expect_success "'ipfs name resolve --offline' succeeds" '
+  ipfs name resolve --offline "$PEERID" >output
+'
+test_expect_success "resolve output looks good" '
+  printf "/ipld/%s/thing\n" "$OBJECT_HASH" >expected4 &&
+  test_cmp expected4 output
+'
+
+test_expect_success "'ipfs name resolve --offline -n' succeeds" '
+  ipfs name resolve --offline -n "$PEERID" >output
+'
+test_expect_success "resolve output looks good" '
+  printf "/ipld/%s/thing\n" "$OBJECT_HASH" >expected4 &&
+  test_cmp expected4 output
+'
+
 test_launch_ipfs_daemon
 
+test_expect_success "'ipfs name resolve --offline' succeeds" '
+  ipfs name resolve --offline "$PEERID" >output
+'
+test_expect_success "resolve output looks good" '
+  printf "/ipld/%s/thing\n" "$OBJECT_HASH" >expected4 &&
+  test_cmp expected4 output
+'
+
+test_expect_success "'ipfs name resolve --offline -n' succeeds" '
+  ipfs name resolve --offline -n "$PEERID" >output
+'
+test_expect_success "resolve output looks good" '
+  printf "/ipld/%s/thing\n" "$OBJECT_HASH" >expected4 &&
+  test_cmp expected4 output
+'
+
 test_expect_success "empty request to name publish doesn't panic and returns error" '
   curl "http://$API_ADDR/api/v0/name/publish" > curl_out || true &&
     grep "argument \"ipfs-path\" is required" curl_out