diff --git a/mcs/errors/cs0172-2.cs b/mcs/errors/cs0172-2.cs
new file mode 100644
index 000000000000..71fbcb5bdbc8
--- /dev/null
+++ b/mcs/errors/cs0172-2.cs
@@ -0,0 +1,11 @@
+// CS0172: Type of conditional expression cannot be determined as `byte' and `int' convert implicitly to each other
+// Line: 9
+
+public class Tester
+{
+	public static void Main ()
+	{
+		byte x = 4;
+		var a = true ? x : 0;
+	}
+}
diff --git a/mcs/errors/cs0172.cs b/mcs/errors/cs0172.cs
index fa6e77ae5783..5c8dc365fc7e 100644
--- a/mcs/errors/cs0172.cs
+++ b/mcs/errors/cs0172.cs
@@ -1,4 +1,4 @@
-// cs0172.cs: Can not compute type of conditional expression as `X' and `Y' convert implicitly to each other
+// CS0172: Type of conditional expression cannot be determined as `X' and `Y' convert implicitly to each other
 // Line: 25
 
 class X {