diff --git a/tests/managed/arrays.cs b/tests/managed/arrays.cs
index ed31e62..ba2d153 100644
--- a/tests/managed/arrays.cs
+++ b/tests/managed/arrays.cs
@@ -1,5 +1,3 @@
-#if NON_OBJC_SUPPORTED_TESTS
-
 using System;
 using System.Linq;
 
@@ -23,5 +21,3 @@ namespace Arrays {
 		}
 	}
 }
-
-#endif
\ No newline at end of file
diff --git a/tests/managed/builtins.cs b/tests/managed/builtins.cs
new file mode 100644
index 0000000..e6d357d
--- /dev/null
+++ b/tests/managed/builtins.cs
@@ -0,0 +1,35 @@
+using System;
+
+public class BuiltinTypes
+{
+	public void ReturnsVoid () { }
+	public bool ReturnsBool () { return true; }
+	public sbyte ReturnsSByte () { return -5; }
+	public byte ReturnsByte () { return 5; }
+	public short ReturnsShort () { return -5; }
+	public ushort ReturnsUShort () { return 5; }
+	public int ReturnsInt () { return -5; }
+	public uint ReturnsUInt () { return 5; }
+	public long ReturnsLong () { return -5; }
+	public ulong ReturnsULong () { return 5; }
+	public char ReturnsChar () { return 'a'; }
+	public string ReturnsString () { return "Mono"; }
+
+	public bool PassAndReturnsBool (bool v) { return v; }
+	public sbyte PassAndReturnsSByte (sbyte v) { return v; }
+	public byte PassAndReturnsByte (byte v) { return v; }
+	public short PassAndReturnsShort (short v) { return v; }
+	public ushort PassAndReturnsUShort (ushort v) { return v; }
+	public int PassAndReturnsInt (int v) { return v; }
+	public uint PassAndReturnsUInt (uint v) { return v; }
+	public long PassAndReturnsLong (long v) { return v; }
+	public ulong PassAndReturnsULong (ulong v) { return v; }
+	public char PassAndReturnsChar (char v) { return v; }
+	public string PassAndReturnsString (string v) { return v; }
+
+	public void PassOutInt (out int v) { v = 5; }
+	public void PassRefInt (ref int v) { v = 10; }
+
+	public void PassOutString (out string v) { v = "Mono"; }
+	public void PassRefString (ref string v) { v = "Mono"; }
+}
diff --git a/tests/managed/managed-shared.projitems b/tests/managed/managed-shared.projitems
index 0778984..a4b6137 100644
--- a/tests/managed/managed-shared.projitems
+++ b/tests/managed/managed-shared.projitems
@@ -11,6 +11,8 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)arrays.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)builtins.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)constructors.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)enums.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)equalsHashOverrides.cs" />
diff --git a/tests/managed/types.cs b/tests/managed/types.cs
index c93b17a..ab7d92a 100644
--- a/tests/managed/types.cs
+++ b/tests/managed/types.cs
@@ -80,44 +80,6 @@ public static class Type_String
 	public static string NonEmptyString { get { return "Hello World"; } }
 }
 
-#if NON_OBJC_SUPPORTED_TESTS
-
-public class BuiltinTypes
-{
-	public void ReturnsVoid () { }
-	public bool ReturnsBool () { return true; }
-	public sbyte ReturnsSByte () { return -5; }
-	public byte ReturnsByte () { return 5; }
-	public short ReturnsShort () { return -5; }
-	public ushort ReturnsUShort () { return 5; }
-	public int ReturnsInt () { return -5; }
-	public uint ReturnsUInt () { return 5; }
-	public long ReturnsLong () { return -5; }
-	public ulong ReturnsULong () { return 5; }
-	public char ReturnsChar () { return 'a'; }
-	public string ReturnsString () { return "Mono"; }
-
-	public bool PassAndReturnsBool (bool v) { return v; }
-	public sbyte PassAndReturnsSByte (sbyte v) { return v; }
-	public byte PassAndReturnsByte (byte v) { return v; }
-	public short PassAndReturnsShort (short v) { return v; }
-	public ushort PassAndReturnsUShort (ushort v) { return v; }
-	public int PassAndReturnsInt (int v) { return v; }
-	public uint PassAndReturnsUInt (uint v) { return v; }
-	public long PassAndReturnsLong (long v) { return v; }
-	public ulong PassAndReturnsULong (ulong v) { return v; }
-	public char PassAndReturnsChar (char v) { return v; }
-	public string PassAndReturnsString (string v) { return v; }
-
-	public void PassOutInt (out int v) { v = 5; }
-	public void PassRefInt (ref int v) { v = 10; }
-
-	public void PassOutString (out string v) { v = "Mono"; }
-	public void PassRefString (ref string v) { v = "Mono"; }
-}
-
-#endif
-
 // objc: this type won't be generated (Exception is not supported) but the generation will succeed (with warnings)
 public class MyException : Exception {
 }