Index: tests/src/Appender/RollingFileAppenderTest.cs
===================================================================
--- tests/src/Appender/RollingFileAppenderTest.cs	(revision 1713585)
+++ tests/src/Appender/RollingFileAppenderTest.cs	(working copy)
@@ -1709,8 +1709,7 @@
 		public void TestInterProcessLockRoll()
 		{
 			String filename = "test.log";
-			bool locked;
-
+			
 			SilentErrorHandler sh = new SilentErrorHandler();
 			ILogger log = CreateLogger(filename, new FileAppender.InterProcessLock(), sh, 1, 2);
 
Index: tests/src/Appender/SmtpPickupDirAppenderTest.cs
===================================================================
--- tests/src/Appender/SmtpPickupDirAppenderTest.cs	(revision 1713585)
+++ tests/src/Appender/SmtpPickupDirAppenderTest.cs	(working copy)
@@ -220,8 +220,7 @@
 			Assert.AreEqual(1, Directory.GetFiles(_testPickupDir).Length);
 			var fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]);
 			Assert.AreEqual("." + fileExtension, fileInfo.Extension);
-			Guid tmpGuid;
-			Assert.IsTrue(Guid.TryParse(fileInfo.Name.Substring(0, fileInfo.Name.Length - fileInfo.Extension.Length), out tmpGuid)); // Assert that filename before extension is a guid
+			Assert.DoesNotThrow(delegate { new Guid(fileInfo.Name.Substring(0, fileInfo.Name.Length - fileInfo.Extension.Length)); }); // Assert that filename before extension is a guid
 
 			Assert.AreEqual("", sh.Message, "Unexpected error message");
 		}
@@ -242,8 +241,7 @@
 			Assert.AreEqual(1, Directory.GetFiles(_testPickupDir).Length);
 			var fileInfo = new FileInfo(Directory.GetFiles(_testPickupDir)[0]);
 			Assert.IsEmpty(fileInfo.Extension);
-			Guid tmpGuid;
-			Assert.IsTrue(Guid.TryParse(fileInfo.Name, out tmpGuid)); // Assert that filename is a guid
+		    Assert.DoesNotThrow(delegate { new Guid(fileInfo.Name); }); // Assert that filename is a guid
 
 			Assert.AreEqual("", sh.Message, "Unexpected error message");
 		}