5 files changed, 17 insertions, 27 deletions
diff --git a/test/README.md b/test/README.md
index fd72ecd00..90dcdfe3d 100644
--- a/test/README.md
+++ b/test/README.md
@@ -34,27 +34,14 @@ between Ginkgo and the Go test framework.
 ## Installing dependencies
 The dependencies for integration really consists of three things:
 * ginkgo binary
-* ginkgo sources
-* gomega sources
 
 The following instructions assume your GOPATH is ~/go. Adjust as needed for your
 environment.
 
 ### Installing ginkgo
-Fetch and build ginkgo with the following command:
+Build ginkgo and install it under $GOPATH/bin with the following command:
 ```
-GOPATH=~/go go get -u github.com/onsi/ginkgo/ginkgo
-```
-Now install the ginkgo binary into your path:
-```
-install -D -m 755 "$GOPATH"/bin/ginkgo /usr/bin/
-```
-You now have a ginkgo binary and its sources in your GOPATH.
-
-### Install gomega sources
-The gomega sources can be simply installed with the command:
-```
-GOPATH=~/go go get github.com/onsi/gomega/...
+GOPATH=~/go make .install.ginkgo
 ```
 
 # Integration Tests
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 308a6bf29..b22ead3fa 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -34,7 +34,7 @@ type PodmanTestIntegration struct {
 	ConmonBinary        string
 	CrioRoot            string
 	CNIConfigDir        string
-	RunCBinary          string
+	OCIRuntime          string
 	RunRoot             string
 	StorageOptions      string
 	SignaturePolicyPath string
@@ -136,12 +136,16 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
 		cgroupManager = "cgroupfs"
 	}
 
-	runCBinary, err := exec.LookPath("runc")
-	// If we cannot find the runc binary, setting to something static as we have no way
-	// to return an error.  The tests will fail and point out that the runc binary could
-	// not be found nicely.
-	if err != nil {
-		runCBinary = "/usr/bin/runc"
+	ociRuntime := os.Getenv("OCI_RUNTIME")
+	if ociRuntime == "" {
+		var err error
+		ociRuntime, err = exec.LookPath("runc")
+		// If we cannot find the runc binary, setting to something static as we have no way
+		// to return an error.  The tests will fail and point out that the runc binary could
+		// not be found nicely.
+		if err != nil {
+			ociRuntime = "/usr/bin/runc"
+		}
 	}
 
 	CNIConfigDir := "/etc/cni/net.d"
@@ -156,7 +160,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
 		ConmonBinary:        conmonBinary,
 		CrioRoot:            filepath.Join(tempDir, "crio"),
 		CNIConfigDir:        CNIConfigDir,
-		RunCBinary:          runCBinary,
+		OCIRuntime:          ociRuntime,
 		RunRoot:             filepath.Join(tempDir, "crio-run"),
 		StorageOptions:      storageOptions,
 		SignaturePolicyPath: filepath.Join(INTEGRATION_ROOT, "test/policy.json"),
diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go
index de3f23667..dba0a2255 100644
--- a/test/e2e/export_test.go
+++ b/test/e2e/export_test.go
@@ -1,5 +1,3 @@
-// +build !remoteclient
-
 package integration
 
 import (
@@ -37,6 +35,7 @@ var _ = Describe("Podman export", func() {
 	})
 
 	It("podman export output flag", func() {
+		SkipIfRemote()
 		_, ec, cid := podmanTest.RunLsContainer("")
 		Expect(ec).To(Equal(0))
 
diff --git a/test/e2e/libpod_suite_remoteclient_test.go b/test/e2e/libpod_suite_remoteclient_test.go
index 4b769a574..e6bc00397 100644
--- a/test/e2e/libpod_suite_remoteclient_test.go
+++ b/test/e2e/libpod_suite_remoteclient_test.go
@@ -164,7 +164,7 @@ func (p *PodmanTestIntegration) makeOptions(args []string) []string {
 //MakeOptions assembles all the podman main options
 func getVarlinkOptions(p *PodmanTestIntegration, args []string) []string {
 	podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s",
-		p.CrioRoot, p.RunRoot, p.RunCBinary, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ")
+		p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ")
 	if os.Getenv("HOOK_OPTION") != "" {
 		podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
 	}
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 1f218cbdf..4b4baa93c 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -207,7 +207,7 @@ func PodmanTestCreate(tempDir string) *PodmanTestIntegration {
 //MakeOptions assembles all the podman main options
 func (p *PodmanTestIntegration) makeOptions(args []string) []string {
 	podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s",
-		p.CrioRoot, p.RunRoot, p.RunCBinary, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ")
+		p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ")
 	if os.Getenv("HOOK_OPTION") != "" {
 		podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
 	}