diff --git a/tests/actions/make/cpp/test_target_rules.lua b/tests/actions/make/cpp/test_target_rules.lua
index 1f22e98b..362eb556 100644
--- a/tests/actions/make/cpp/test_target_rules.lua
+++ b/tests/actions/make/cpp/test_target_rules.lua
@@ -35,7 +35,6 @@
 		test.capture [[
 all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
 	@:
-
   		]]
 	end
 
@@ -54,6 +53,5 @@ all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET) $(dir $(TARGETDIR))PkgInf
 
 $(dir $(TARGETDIR))PkgInfo:
 $(dir $(TARGETDIR))Info.plist:
-
   		]]
 	end
diff --git a/tests/config/test_linkinfo.lua b/tests/config/test_linkinfo.lua
index ab2bc30b..eba561b3 100755
--- a/tests/config/test_linkinfo.lua
+++ b/tests/config/test_linkinfo.lua
@@ -20,7 +20,7 @@
 		_ACTION = "test"
 		sln, prj = test.createsolution()
 		kind "StaticLib"
-		system "windows"
+		system "Windows"
 	end
 
 	local function prepare()
@@ -96,3 +96,19 @@
 		test.isequal("MyTargetImports", i.basename)
 	end
 
+
+--
+-- Test library name formatting.
+--
+
+	function suite.nameFormatting_onWindows()
+		system "Windows"
+		i = prepare()
+		test.isequal("MyProject.lib", i.name)
+	end
+
+	function suite.nameFormatting_onLinux()
+		system "Linux"
+		i = prepare()
+		test.isequal("libMyProject.a", i.name)
+	end
diff --git a/tests/tools/test_gcc.lua b/tests/tools/test_gcc.lua
index a3f6c8bb..920ac325 100644
--- a/tests/tools/test_gcc.lua
+++ b/tests/tools/test_gcc.lua
@@ -201,9 +201,12 @@
 
 	function suite.links_onStaticSiblingLibrary()
 		links { "MyProject2" }
+
 		test.createproject(sln)
+		system "Linux"
 		kind "StaticLib"
 		targetdir "lib"
+
 		prepare()
 		test.isequal({ "lib/libMyProject2.a" }, gcc.getlinks(cfg))
 	end
@@ -215,9 +218,12 @@
 
 	function suite.links_onStaticSharedLibrary()
 		links { "MyProject2" }
+
 		test.createproject(sln)
+		system "Linux"
 		kind "SharedLib"
 		targetdir "lib"
+
 		prepare()
 		test.isequal({ "-lMyProject2" }, gcc.getlinks(cfg))
 	end
diff --git a/tests/tools/test_snc.lua b/tests/tools/test_snc.lua
index db346b6f..518747d3 100644
--- a/tests/tools/test_snc.lua
+++ b/tests/tools/test_snc.lua
@@ -86,10 +86,13 @@
 
 	function suite.links_onStaticSiblingLibrary()
 		links { "MyProject2" }
+
 		test.createproject(sln)
+		system "Linux"
 		kind "StaticLib"
 		location "MyProject2"
 		targetdir "lib"
+
 		prepare()
 		test.isequal({ "lib/libMyProject2.a" }, snc.getlinks(cfg))
 	end