diff --git a/cmd/amd-ctk/cdi/generate/generate.go b/cmd/amd-ctk/cdi/generate/generate.go
index f999ae4..4a63188 100644
--- a/cmd/amd-ctk/cdi/generate/generate.go
+++ b/cmd/amd-ctk/cdi/generate/generate.go
@@ -18,7 +18,6 @@ package generate
 
 import (
 	"fmt"
-	"os/user"
 	"path/filepath"
 	"strings"
 
@@ -63,11 +62,6 @@ func AddNewCommand() *cli.Command {
 }
 
 func validateGenOptions(c *cli.Context, genOptions *generateOptions) error {
-	curUser, err := user.Current()
-	if err != nil || curUser.Uid != "0" {
-		return fmt.Errorf("Permission denied: Not running as root")
-	}
-
 	out, err := filepath.Abs(genOptions.output)
 	if err != nil {
 		return fmt.Errorf("incorrect output file, Err: %v", err)
diff --git a/cmd/amd-ctk/cdi/validate/validate.go b/cmd/amd-ctk/cdi/validate/validate.go
index 4c74d74..cd017c0 100644
--- a/cmd/amd-ctk/cdi/validate/validate.go
+++ b/cmd/amd-ctk/cdi/validate/validate.go
@@ -18,7 +18,6 @@ package validate
 
 import (
 	"fmt"
-	"os/user"
 	"path/filepath"
 	"strings"
 
@@ -63,11 +62,6 @@ func AddNewCommand() *cli.Command {
 }
 
 func validateValOptions(c *cli.Context, valOptions *validateOptions) error {
-	curUser, err := user.Current()
-	if err != nil || curUser.Uid != "0" {
-		return fmt.Errorf("Permission denied: Not running as root")
-	}
-
 	out, err := filepath.Abs(valOptions.cdiSpecPath)
 	if err != nil {
 		return fmt.Errorf("Incorrect CDI spec file, Error: %v", err)
diff --git a/internal/cdi/cdi_test.go b/internal/cdi/cdi_test.go
index 8156d1f..86f4882 100644
--- a/internal/cdi/cdi_test.go
+++ b/internal/cdi/cdi_test.go
@@ -67,7 +67,7 @@ func TestInterface(t *testing.T) {
 	err := cdi.GenerateSpec()
 	Assert(t, err == nil, fmt.Sprintf("failed to generate cdi spec, Err: %v", err))
 
-	cdi.specPath = "/tmp/"
+	cdi.specPath = t.TempDir() + "/amd.json"
 	err = cdi.WriteSpec()
 	Assert(t, err == nil, fmt.Sprintf("WriteSpec() returned error %v", err))