diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a299ff5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/bin/*
+/build/*.exe
+/build/gmake
+/build/vs*/
+/thirdparty/lib
+/intermediate
diff --git a/test/unittest/encodedstreamtest.cpp b/test/unittest/encodedstreamtest.cpp
index 7770ce6..7f12206 100644
--- a/test/unittest/encodedstreamtest.cpp
+++ b/test/unittest/encodedstreamtest.cpp
@@ -85,7 +85,7 @@ protected:
 	template <typename FileEncoding, typename MemoryEncoding>
 	void TestEncodedOutputStream(const char* expectedFilename, bool putBOM) {
 		char filename[L_tmpnam];
-		tmpnam(filename);
+		TempFilename(filename);
 
 		FILE *fp = fopen(filename, "wb");
 		char buffer[16];
@@ -114,7 +114,7 @@ protected:
 
 	void TestAutoUTFOutputStream(UTFType type, bool putBOM, const char *expectedFilename) {
 		char filename[L_tmpnam];
-		tmpnam(filename);
+		TempFilename(filename);
 
 		FILE *fp = fopen(filename, "wb");
 		char buffer[16];
diff --git a/test/unittest/filestreamtest.cpp b/test/unittest/filestreamtest.cpp
index 7473ff4..0230e4c 100644
--- a/test/unittest/filestreamtest.cpp
+++ b/test/unittest/filestreamtest.cpp
@@ -70,7 +70,7 @@ TEST_F(FileStreamTest, FileReadStream) {
 
 TEST_F(FileStreamTest, FileWriteStream) {
 	char filename[L_tmpnam];
-	tmpnam(filename);
+	TempFilename(filename);
 
 	FILE *fp = fopen(filename, "wb");
 	char buffer[65536];
diff --git a/test/unittest/unittest.h b/test/unittest/unittest.h
index 077c8fe..c954e55 100644
--- a/test/unittest/unittest.h
+++ b/test/unittest/unittest.h
@@ -30,4 +30,13 @@ inline Ch* StrDup(const Ch* str) {
 	return buffer;
 }
 
+inline void TempFilename(char *filename) {
+	tmpnam(filename);
+
+	// For Visual Studio, tmpnam() adds a backslash in front. Remove it.
+	if (filename[0] == '\\')
+		for (int i = 0; filename[i] != '\0'; i++)
+			filename[i] = filename[i + 1];
+}
+
 #endif // UNITTEST_H_