diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go
index 910c7ba350..5e8ac81a2d 100644
--- a/cmd/podman/rmi.go
+++ b/cmd/podman/rmi.go
@@ -24,22 +24,22 @@ var (
 		},
 	}
 	rmiCommand = cli.Command{
-		Name:        "rmi",
-		Usage:       "Removes one or more images from local storage",
-		Description: rmiDescription,
-		Action:      rmiCmd,
-		ArgsUsage:   "IMAGE-NAME-OR-ID [...]",
-		Flags:       sortFlags(rmiFlags),
+		Name:                   "rmi",
+		Usage:                  "Removes one or more images from local storage",
+		Description:            rmiDescription,
+		Action:                 rmiCmd,
+		ArgsUsage:              "IMAGE-NAME-OR-ID [...]",
+		Flags:                  sortFlags(rmiFlags),
 		UseShortOptionHandling: true,
 		OnUsageError:           usageErrorHandler,
 	}
 	rmImageCommand = cli.Command{
-		Name:        "rm",
-		Usage:       "removes one or more images from local storage",
-		Description: rmiDescription,
-		Action:      rmiCmd,
-		ArgsUsage:   "IMAGE-NAME-OR-ID [...]",
-		Flags:       rmiFlags,
+		Name:                   "rm",
+		Usage:                  "removes one or more images from local storage",
+		Description:            rmiDescription,
+		Action:                 rmiCmd,
+		ArgsUsage:              "IMAGE-NAME-OR-ID [...]",
+		Flags:                  rmiFlags,
 		UseShortOptionHandling: true,
 		OnUsageError:           usageErrorHandler,
 	}
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 2104991b22..d73d8662f2 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -253,6 +253,9 @@ var _ = Describe("Podman run", func() {
 	})
 
 	It("podman run blkio-weight test", func() {
+		if _, err := os.Stat("/sys/fs/cgroup/blkio/blkio.weight"); os.IsNotExist(err) {
+			Skip("Kernel does not support blkio.weight")
+		}
 		session := podmanTest.Podman([]string{"run", "--rm", "--blkio-weight=15", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.weight"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))