@@ -901,6 +901,7 @@ func readContainerFileWithExec(containerId, filename string) ([]byte, error) {

 }

 func setupRegistry(t *testing.T) func() {

+	testRequires(t, RegistryHosting)

 	reg, err := newTestRegistryV2(t)

 	if err != nil {

 		t.Fatal(err)

@@ -1,6 +1,8 @@

 package main

 import (

+	"fmt"

+	"os/exec"

 	"testing"

 )

@@ -25,6 +27,16 @@ var (

 		func() bool { return supportsExec },

 		"Test requires 'docker exec' capabilities on the tested daemon.",

 	}

+	RegistryHosting = TestRequirement{

+		func() bool {

+			// for now registry binary is built only if we're running inside

+			// container through `make test`. Figure that out by testing if

+			// registry binary is in PATH.

+			_, err := exec.LookPath(v2binary)

+			return err == nil

+		},

+		fmt.Sprintf("Test requires an environment that can host %s in the same host", v2binary),

+	}

 )

 // testRequires checks if the environment satisfies the requirements