diff --git a/main_test.go b/main_test.go
index 09296b7..2420341 100644
--- a/main_test.go
+++ b/main_test.go
@@ -95,6 +95,7 @@ func TestCreateToRun(t *testing.T) {
 	})
 	require.NoError(t, err)
 	require.NotNil(t, init)
+	require.Equal(t, runtimev0.InitStatus_READY, init.Status.State, init.Status.Message)
 
 	defer func() {
 		_, err = runtime.Destroy(ctx, &runtimev0.DestroyRequest{})
diff --git a/recovery_scope_test.go b/recovery_scope_test.go
new file mode 100644
index 0000000..96a5b1d
--- /dev/null
+++ b/recovery_scope_test.go
@@ -0,0 +1,33 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/codefly-dev/core/runners/dockerrun"
+)
+
+// The source-validation suite owns its fixture containers independently of
+// the CLI grandparent that launched the Go test process.
+func TestMain(m *testing.M) {
+	code := func() int {
+		dir, err := os.MkdirTemp("", "service-dynamodb-test-scope-*")
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			return 1
+		}
+		defer os.RemoveAll(dir)
+		scope, err := dockerrun.NewContainerRecoveryScope(dir, dir, "service-dynamodb-tests")
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			return 1
+		}
+		if err := dockerrun.SetContainerRecoveryScope(scope); err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			return 1
+		}
+		return m.Run()
+	}()
+	os.Exit(code)
+}