diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 265763b8b4..3e88fed73b 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -269,7 +269,7 @@ remove_packaged_podman_files() {
     req_env_vars OS_RELEASE_ID
 
     # If any binaries are resident they could cause unexpected pollution
-    for unit in io.podman.service io.podman.socket
+    for unit in podman.socket podman-auto-update.timer
     do
         for state in enabled active
         do
@@ -291,6 +291,9 @@ remove_packaged_podman_files() {
         LISTING_CMD="rpm -ql podman"
     fi
 
+    # delete the podman socket in case it has been created previously
+    rm -f $(podman info --format "{{.Host.RemoteSocket.Path}}")
+
     # yum/dnf/dpkg may list system directories, only remove files
     $LISTING_CMD | while read fullpath
     do
diff --git a/libpod/define/info.go b/libpod/define/info.go
index 9354ae31a9..4ba718afd6 100644
--- a/libpod/define/info.go
+++ b/libpod/define/info.go
@@ -68,7 +68,7 @@ type HostInfo struct {
 // RemoteSocket describes information about the API socket
 type RemoteSocket struct {
 	Path   string `json:"path,omitempty"`
-	Exists bool   `json:"exists,omitempty"`
+	Exists bool   `json:"exists"`
 }
 
 // SlirpInfo describes the slirp executable that is being used
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
index 93f7a46f2a..7714c1abc2 100644
--- a/test/e2e/info_test.go
+++ b/test/e2e/info_test.go
@@ -118,6 +118,8 @@ var _ = Describe("Podman Info", func() {
 		Expect(session).Should(Exit(0))
 		if IsRemote() {
 			Expect(session.OutputToString()).To(ContainSubstring("true"))
+		} else {
+			Expect(session.OutputToString()).To(ContainSubstring("false"))
 		}
 
 	})