diff --git a/Zip/testsuite/src/CompressTest.cpp b/Zip/testsuite/src/CompressTest.cpp
index 62102b8c1..d52124ce4 100644
--- a/Zip/testsuite/src/CompressTest.cpp
+++ b/Zip/testsuite/src/CompressTest.cpp
@@ -161,9 +161,9 @@ void CompressTest::testZip64()
 {
 	std::cout << std::endl;
 	std::map<std::string, Poco::UInt64> files;
-	files["data1.bin"] = static_cast<Poco::UInt64>(MB)*4096+1;
-	files["data2.bin"] = static_cast<Poco::UInt64>(MB)*16;
-	files["data3.bin"] = static_cast<Poco::UInt64>(MB)*4096-1;
+	files["data1.bin"] = static_cast<Poco::UInt64>(KB)*4096+1;
+	files["data2.bin"] = static_cast<Poco::UInt64>(KB)*16;
+	files["data3.bin"] = static_cast<Poco::UInt64>(KB)*4096-1;
 	
 	for(std::map<std::string, Poco::UInt64>::const_iterator it = files.begin(); it != files.end(); it++) 
 	{
diff --git a/Zip/testsuite/src/CompressTest.h b/Zip/testsuite/src/CompressTest.h
index 0d24921a7..3d604300e 100644
--- a/Zip/testsuite/src/CompressTest.h
+++ b/Zip/testsuite/src/CompressTest.h
@@ -33,7 +33,9 @@ public:
 	void testManipulatorReplace();
 	void testSetZipComment();
 
-	static const Poco::UInt64 MB = (1024*1024);
+	static const Poco::UInt64 KB = 1024;
+	static const Poco::UInt64 MB = (1024*KB);
+	static const Poco::UInt64 GB = (1024*MB);
 	void createDataFile(const std::string& path, Poco::UInt64 size);
 	void testZip64();