diff --git a/build/Tests.lua b/build/Tests.lua
index 46d01900..ac5ace34 100644
--- a/build/Tests.lua
+++ b/build/Tests.lua
@@ -15,8 +15,8 @@ end
 function SetupTestProject(name, file, lib)
   SetupTestGeneratorProject(name)
   SetupTestNativeProject(name)  
-  SetupTestProjectsCSharp(name, file, lib)
-  SetupTestProjectsCLI(name, file, lib)
+  SetupTestProjectsCSharp(name)
+  SetupTestProjectsCLI(name)
 end
 
 function SetupTestCSharp(name)
@@ -102,7 +102,7 @@ function LinkNUnit()
   }
 end
 
-function SetupTestProjectsCSharp(name, file, lib)
+function SetupTestProjectsCSharp(name, depends)
   project(name .. ".CSharp")
     SetupManagedTestProject()
 
@@ -114,7 +114,13 @@ function SetupTestProjectsCSharp(name, file, lib)
       path.join(gendir, name, name .. ".cs"),
     }
 
-    links { "CppSharp.Runtime" }
+    linktable = { "CppSharp.Runtime" }
+
+    if depends ~= nil then
+      table.insert(linktable, depends)
+    end
+
+    links(linktable)
 
   project(name .. ".Tests.CSharp")
     SetupManagedTestProject()
@@ -127,7 +133,7 @@ function SetupTestProjectsCSharp(name, file, lib)
     links { "CppSharp.Runtime" }
 end
 
-function SetupTestProjectsCLI(name, file, lib)
+function SetupTestProjectsCLI(name)
   if not os.is_windows() then
     return
   end
diff --git a/tests/NamespacesBase/Base.cpp b/tests/NamespacesBase/NamespacesBase.cpp
similarity index 64%
rename from tests/NamespacesBase/Base.cpp
rename to tests/NamespacesBase/NamespacesBase.cpp
index 898b50d5..07685d46 100644
--- a/tests/NamespacesBase/Base.cpp
+++ b/tests/NamespacesBase/NamespacesBase.cpp
@@ -1,4 +1,4 @@
-#include "Base.h"
+#include "NamespacesBase.h"
 
 
 Base::Base(int i)
diff --git a/tests/NamespacesBase/Base.h b/tests/NamespacesBase/NamespacesBase.h
similarity index 100%
rename from tests/NamespacesBase/Base.h
rename to tests/NamespacesBase/NamespacesBase.h
diff --git a/tests/NamespacesDerived/Derived.cpp b/tests/NamespacesDerived/NamespacesDerived.cpp
similarity index 61%
rename from tests/NamespacesDerived/Derived.cpp
rename to tests/NamespacesDerived/NamespacesDerived.cpp
index 66c6422e..4bb67564 100644
--- a/tests/NamespacesDerived/Derived.cpp
+++ b/tests/NamespacesDerived/NamespacesDerived.cpp
@@ -1,4 +1,4 @@
-#include "Derived.h"
+#include "NamespacesDerived.h"
 
 
 Derived::Derived() : Base(10), component(5)
diff --git a/tests/NamespacesDerived/NamespacesDerived.cs b/tests/NamespacesDerived/NamespacesDerived.cs
index b43058da..c9f49ffe 100644
--- a/tests/NamespacesDerived/NamespacesDerived.cs
+++ b/tests/NamespacesDerived/NamespacesDerived.cs
@@ -1,4 +1,4 @@
-?using System;
+using System;
 using CppSharp.AST;
 using CppSharp.Generators;
 using CppSharp.Utils;
@@ -15,13 +15,14 @@ namespace CppSharp.Tests
 
         public override void SetupPasses(Driver driver)
         {
+            driver.Options.DependentNameSpaces.Add("NamespacesBase");
         }
 
         public override void Preprocess(Driver driver, ASTContext ctx)
         {
             foreach (TranslationUnit unit in ctx.TranslationUnits)
             {
-                if (unit.FileName != "Derived.h")
+                if (unit.FileName != "NamespacesDerived.h")
                 {
                     unit.GenerationKind = GenerationKind.Link;
                 }
diff --git a/tests/NamespacesDerived/Derived.h b/tests/NamespacesDerived/NamespacesDerived.h
similarity index 72%
rename from tests/NamespacesDerived/Derived.h
rename to tests/NamespacesDerived/NamespacesDerived.h
index bc1103ed..091fb7c4 100644
--- a/tests/NamespacesDerived/Derived.h
+++ b/tests/NamespacesDerived/NamespacesDerived.h
@@ -1,5 +1,5 @@
 #include "../Tests.h"
-#include "../NamespacesBase/Base.h"
+#include "../NamespacesBase/NamespacesBase.h"
 
 class DLL_API Derived : public Base
 {
diff --git a/tests/NamespacesDerived/premake4.lua b/tests/NamespacesDerived/premake4.lua
index 4715ed5e..0056d5f6 100644
--- a/tests/NamespacesDerived/premake4.lua
+++ b/tests/NamespacesDerived/premake4.lua
@@ -1,4 +1,4 @@
 group "Tests/Namespaces"
   SetupTestGeneratorProject("NamespacesDerived")
   SetupTestNativeProject("NamespacesDerived", "NamespacesBase.Native")
-  SetupTestProjectsCSharp("NamespacesDerived")
\ No newline at end of file
+  SetupTestProjectsCSharp("NamespacesDerived", "NamespacesBase.CSharp")
\ No newline at end of file