diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index dfd6c06fde..9601ffce5b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -34,7 +34,7 @@ using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
-    public class GodsModules : IRegionModule, IGodsModule
+    public class GodsModule : IRegionModule, IGodsModule
     {
         protected Scene m_scene;
         protected IDialogModule m_dialogModule;
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 5d35e35176..d4c2daaa7b 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -38,6 +38,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.CoreModules.Agent.Capabilities;
+using OpenSim.Region.CoreModules.Avatar.Gods;
 using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Tests.Common.Setup
@@ -82,9 +83,14 @@ namespace OpenSim.Tests.Common.Setup
             TestScene testScene = new TestScene(
                 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null);
 
-            IRegionModule capsModule = new CapabilitiesModule();
+            IRegionModule capsModule = new CapabilitiesModule();            
             capsModule.Initialise(testScene, new IniConfigSource());
             testScene.AddModule(capsModule.Name, capsModule);
+            
+            IRegionModule godsModule = new GodsModule();
+            godsModule.Initialise(testScene, new IniConfigSource());
+            testScene.AddModule(godsModule.Name, godsModule);
+            
             testScene.SetModuleInterfaces();
 
             testScene.LandChannel = new TestLandChannel();