@@ -1,10 +1,10 @@

 package docker

 import (

+	"fmt"

 	"io/ioutil"

 	"sync"

 	"testing"

-	"fmt"

 )

 // mkTestContext generates a build context from the contents of the provided dockerfile.

@@ -104,8 +104,8 @@ func TestBuild(t *testing.T) {

 		defer nuke(runtime)

 		srv := &Server{

-			runtime: runtime,

-			lock: &sync.Mutex{},

+			runtime:     runtime,

+			lock:        &sync.Mutex{},

 			pullingPool: make(map[string]struct{}),

 			pushingPool: make(map[string]struct{}),

 		}

@@ -511,12 +511,15 @@ func TestKillDifferentUser(t *testing.T) {

 		t.Fatal(err)

 	}

-	setTimeout(t, "Waiting for the container to be started timed out", 2 * time.Second, func() {

+	setTimeout(t, "Waiting for the container to be started timed out", 2*time.Second, func() {

 		for !container.State.Running {

 			time.Sleep(10 * time.Millisecond)

 		}

 	})

+	// Even if the state is running, lets give some time to lxc to spawn the process

+	container.WaitTimeout(500 * time.Millisecond)

+

 	if err := container.Kill(); err != nil {

 		t.Fatal(err)

 	}

@@ -366,14 +366,14 @@ func TestAllocatePortLocalhost(t *testing.T) {

 	defer container.Kill()

 	setTimeout(t, "Waiting for the container to be started timed out", 2*time.Second, func() {

-		for {

-			if container.State.Running {

-				break

-			}

+		for !container.State.Running {

 			time.Sleep(10 * time.Millisecond)

 		}

 	})

+	// Even if the state is running, lets give some time to lxc to spawn the process

+	container.WaitTimeout(500 * time.Millisecond)

+

 	conn, err := net.Dial("tcp",

 		fmt.Sprintf(

 			"localhost:%s", container.NetworkSettings.PortMapping[strconv.Itoa(port)],