diff --git a/builder/docker/step_temp_dir_test.go b/builder/docker/step_temp_dir_test.go
new file mode 100644
index 000000000..a7d495f65
--- /dev/null
+++ b/builder/docker/step_temp_dir_test.go
@@ -0,0 +1,44 @@
+package docker
+
+import (
+	"github.com/mitchellh/multistep"
+	"os"
+	"testing"
+)
+
+func TestStepTempDir_impl(t *testing.T) {
+	var _ multistep.Step = new(StepTempDir)
+}
+
+func TestStepTempDir(t *testing.T) {
+	state := testState(t)
+	step := new(StepTempDir)
+	defer step.Cleanup(state)
+
+	// sanity test
+	if _, ok := state.GetOk("temp_dir"); ok {
+		t.Fatalf("temp_dir should not be in state yet")
+	}
+
+	// run the step
+	if action := step.Run(state); action != multistep.ActionContinue {
+		t.Fatalf("bad action: %#v", action)
+	}
+
+	// Verify that we got the temp dir
+	dirRaw, ok := state.GetOk("temp_dir")
+	if !ok {
+		t.Fatalf("should've made temp_dir")
+	}
+	dir := dirRaw.(string)
+
+	if _, err := os.Stat(dir); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	// Cleanup
+	step.Cleanup(state)
+	if _, err := os.Stat(dir); err == nil {
+		t.Fatalf("dir should be gone")
+	}
+}
diff --git a/builder/docker/step_test.go b/builder/docker/step_test.go
new file mode 100644
index 000000000..c6487c55f
--- /dev/null
+++ b/builder/docker/step_test.go
@@ -0,0 +1,19 @@
+package docker
+
+import (
+	"bytes"
+	"github.com/mitchellh/multistep"
+	"github.com/mitchellh/packer/packer"
+	"testing"
+)
+
+func testState(t *testing.T) multistep.StateBag {
+	state := new(multistep.BasicStateBag)
+	state.Put("config", testConfigStruct(t))
+	state.Put("hook", &packer.MockHook{})
+	state.Put("ui", &packer.BasicUi{
+		Reader: new(bytes.Buffer),
+		Writer: new(bytes.Buffer),
+	})
+	return state
+}