diff --git a/clar/sandbox.h b/clar/sandbox.h
index 0ba1479..1b14dbf 100644
--- a/clar/sandbox.h
+++ b/clar/sandbox.h
@@ -120,6 +120,12 @@ static int build_sandbox_path(void)
 	if (_mktemp(_clar_path) == NULL)
 		return -1;
 
+	if (mkdir(_clar_path, 0700) != 0)
+		return -1;
+#elif defined(__TANDEM)
+	if (mktemp(_clar_path) == NULL)
+		return -1;
+
 	if (mkdir(_clar_path, 0700) != 0)
 		return -1;
 #elif defined(_WIN32)
diff --git a/test/Makefile b/test/Makefile
index 93c6b2a..29f0543 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -16,7 +16,7 @@ TEST_DIRECTORY    := $(abspath $(dir $(CURRENT_MAKEFILE)))
 CLAR_PATH         := $(dir $(TEST_DIRECTORY))
 CLAR_FIXTURE_PATH := $(TEST_DIRECTORY)/resources/
 
-CFLAGS=-g -I.. -I. -Wall -DCLAR_FIXTURE_PATH=\"$(CLAR_FIXTURE_PATH)\"
+CFLAGS?=-g -I.. -I. -Wall -DCLAR_FIXTURE_PATH=\"$(CLAR_FIXTURE_PATH)\"
 
 .PHONY: clean