diff --git a/tests/fsharp/Compiler/Libraries/Core/Unchecked/DefaultOfTests.fs b/tests/fsharp/Compiler/Libraries/Core/Unchecked/DefaultOfTests.fs
new file mode 100644
index 00000000000..7c732e479ad
--- /dev/null
+++ b/tests/fsharp/Compiler/Libraries/Core/Unchecked/DefaultOfTests.fs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Compiler.UnitTests
+
+open NUnit.Framework
+
+[<TestFixture>]
+module ``DefaultOf Tests`` =
+
+    type DUType = 
+        | A
+        | B of int
+        | C of DUType * DUType
+        
+    type RecordType = { A : int; B : string; C : DUType }
+    
+    type ClassType = string
+       
+    type InterfaceType =
+        abstract DoStuff : unit -> unit
+        
+    type EnumType =
+        | A = 1
+        | B = 2
+        | C = 4
+            
+    type StructType = struct
+        val m_ivalue : int
+        val m_svalue : string
+        member this.IValue = this.m_ivalue
+        member this.SValue = this.m_svalue
+    end
+
+    [<Test>]
+    let `` Unchecked defaultof reference types``() =
+        Assert.areEqual Unchecked.defaultof<ClassType> null
+        Assert.areEqual (box Unchecked.defaultof<DUType>) null
+        Assert.areEqual (box Unchecked.defaultof<RecordType>) null
+        Assert.areEqual (box Unchecked.defaultof<InterfaceType>) null
+
+    [<Test>]
+    let ``Unchecked defaultof stack types``() =
+        Assert.areEqual Unchecked.defaultof<int> 0
+        Assert.areEqual Unchecked.defaultof<float> 0.0
+        Assert.areEqual Unchecked.defaultof<EnumType> (enum 0)
+        Assert.areEqual Unchecked.defaultof<StructType>.IValue 0
+        Assert.areEqual Unchecked.defaultof<StructType>.SValue null
+
+    type R = { x : int; y : string }
+    type U = | A of int | B of string
+    type S = struct val mutable x : int end
+    type C() = class end
+
+    [<Test>]
+    let ``Unchecked defaultof and equality``() =
+        // FSharp1.0:5417 - Unchecked.defaultof<_> on records/unions can cause structural equality check to throw
+        // Check that Unchecked.defaultof<_> works correctly on various types, mostly structs/unions/records
+
+        Assert.areEqual Unchecked.defaultof<R> Unchecked.defaultof<R>
+        Assert.areEqual Unchecked.defaultof<U> Unchecked.defaultof<U>
+        Assert.areEqual Unchecked.defaultof<S> Unchecked.defaultof<S>
+        Assert.areEqual Unchecked.defaultof<C> Unchecked.defaultof<C>
+        Assert.areEqual Unchecked.defaultof<int> Unchecked.defaultof<int>
\ No newline at end of file
diff --git a/tests/fsharp/FSharpSuite.Tests.fsproj b/tests/fsharp/FSharpSuite.Tests.fsproj
index b06425e88dc..3153783ff71 100644
--- a/tests/fsharp/FSharpSuite.Tests.fsproj
+++ b/tests/fsharp/FSharpSuite.Tests.fsproj
@@ -75,6 +75,7 @@
     <Compile Include="Compiler\Libraries\Core\Operators\RoundTests.fs" />
     <Compile Include="Compiler\Libraries\Core\Operators\SignTests.fs" />
     <Compile Include="Compiler\Libraries\Core\Operators\StringTests.fs" />
+    <Compile Include="Compiler\Libraries\Core\Unchecked\DefaultOfTests.fs" />
     <None Include="app.config" />
     <None Include="update.base.line.with.actuals.fsx" />
 
diff --git a/tests/fsharpqa/Source/Libraries/Core/Unchecked/DefaultOf01.fs b/tests/fsharpqa/Source/Libraries/Core/Unchecked/DefaultOf01.fs
deleted file mode 100644
index 196448fc4bf..00000000000
--- a/tests/fsharpqa/Source/Libraries/Core/Unchecked/DefaultOf01.fs
+++ /dev/null
@@ -1,51 +0,0 @@
-// #Regression #Libraries #Unchecked 
-#light
-
-// 1760, Implement Unchecked.defaultof<_> (delete LanguagePrimitives.DefaultValueUnchecked)
-
-// Test the 'defaultof<_>' function
-
-// Reference types ---------------------------
-type DUType = 
-    | A
-    | B of int
-    | C of DUType * DUType
-    
-type RecordType = { A : int; B : string; C : DUType }
-
-type ClassType = string
-   
-type InterfaceType =
-    abstract DoStuff : unit -> unit
-
-// Stack types -------------------------------    
-type EnumType =
-    | A = 1
-    | B = 2
-    | C = 4
-    
-type StructType = struct
-    val m_ivalue : int
-    val m_svalue : string
-    member this.IValue = this.m_ivalue
-    member this.SValue = this.m_svalue
-end
-
-// Test reference types
-if Unchecked.defaultof<ClassType>          <> null then exit 1
-// This behaivor for DU, Records, and Interfaces is bey design (need to box to get null)
-if box(Unchecked.defaultof<DUType>)        <> null then exit 1
-if box(Unchecked.defaultof<RecordType>)    <> null then exit 1
-if box(Unchecked.defaultof<InterfaceType>) <> null then exit 1
-
-let p = Unchecked.defaultof<EnumType>
-
-// Test stack types
-if Unchecked.defaultof<int>   <> 0   then exit 1
-if Unchecked.defaultof<float> <> 0.0 then exit 1
-if Unchecked.defaultof<EnumType> <> enum 0   then exit 1
-
-if (Unchecked.defaultof<StructType>).IValue <> 0    then exit 1
-if (Unchecked.defaultof<StructType>).SValue <> null then exit 1
-
-exit 0
diff --git a/tests/fsharpqa/Source/Libraries/Core/Unchecked/DefaultOf02.fs b/tests/fsharpqa/Source/Libraries/Core/Unchecked/DefaultOf02.fs
deleted file mode 100644
index 00414dd8cc8..00000000000
--- a/tests/fsharpqa/Source/Libraries/Core/Unchecked/DefaultOf02.fs
+++ /dev/null
@@ -1,17 +0,0 @@
-// #Regression #Libraries #Unchecked 
-#light
-
-// FSharp1.0:5417 - Unchecked.defaultof<_> on records/unions can cause structural equality check to throw
-// Check that Unchecked.defaultof<_> works correctly on various types, mostly structs/unions/records
-
-type R = { x : int; y : string }
-type U = | A of int | B of string
-type S = struct val mutable x : int end
-type C() = class end
-
-let shouldBeTrue = 
-    Unchecked.defaultof<R> = Unchecked.defaultof<R>     // Records as null
- && Unchecked.defaultof<U> = Unchecked.defaultof<U>     // Unions  as null
- && Unchecked.defaultof<S> = Unchecked.defaultof<S>     // Structs as null
- && Unchecked.defaultof<C> = Unchecked.defaultof<C>     // Classes as null
- && Unchecked.defaultof<int> = Unchecked.defaultof<int>
diff --git a/tests/fsharpqa/Source/Libraries/Core/Unchecked/env.lst b/tests/fsharpqa/Source/Libraries/Core/Unchecked/env.lst
deleted file mode 100644
index b5cefff3c2e..00000000000
--- a/tests/fsharpqa/Source/Libraries/Core/Unchecked/env.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-	SOURCE=DefaultOf01.fs		# DefaultOf01
-	SOURCE=DefaultOf02.fs		# DefaultOf02
\ No newline at end of file