diff --git a/tests/00_BasicModule.Tests.ps1 b/tests/00_BasicModule.Tests.ps1
index 7e8dfe9..b605a56 100644
--- a/tests/00_BasicModule.Tests.ps1
+++ b/tests/00_BasicModule.Tests.ps1
@@ -9,7 +9,7 @@ Describe "Pre-Flight module tests" {
     }
     Context "Module consistency tests" {
         IT "Importing should work" {
-            { Import-Module -Name $ManifestFilePath -Global } | Should -Not -Throw
+            { Import-Module -Name $ManifestFilePath -Global -Force }| Should -Not -Throw
         }
     }
 }
diff --git a/tests/Helper/01_Resolve-Dependency.Tests.ps1 b/tests/Helper/01_Resolve-Dependency.Tests.ps1
index 9c6e54d..ff44eb7 100644
--- a/tests/Helper/01_Resolve-Dependency.Tests.ps1
+++ b/tests/Helper/01_Resolve-Dependency.Tests.ps1
@@ -16,6 +16,7 @@ Else {
 # load additional functions defined in the repository. Replace the expression <FunctionName>.
 . (Get-ChildItem -Path $RepoRoot -Filter "Get-ModuleBase.ps1" -Recurse).FullName
 . (Get-ChildItem -Path $RepoRoot -Filter "Test-Module.ps1" -Recurse).FullName
+
 #endregion HEADER
 
 Describe "Resolve-Dependency" {
diff --git a/tests/Store/01_Get-CredentialStore.Tests.ps1 b/tests/Store/01_Get-CredentialStore.Tests.ps1
index 5fbe500..a0cab26 100644
--- a/tests/Store/01_Get-CredentialStore.Tests.ps1
+++ b/tests/Store/01_Get-CredentialStore.Tests.ps1
@@ -14,7 +14,7 @@ Else {
 }
 
 # load additional functions defined in the repository. Replace the expression <FunctionName>.
-. (Get-ChildItem -Path $RepoRoot -Filter "Test-CredentialStore.ps1" -Recurse).FullName
+#. (Get-ChildItem -Path $RepoRoot -Filter "Test-CredentialStore.ps1" -Recurse).FullName
 
 #endregion HEADER
 
diff --git a/tools/AppVeyor.psm1 b/tools/AppVeyor.psm1
index de78763..71e1e85 100644
--- a/tools/AppVeyor.psm1
+++ b/tools/AppVeyor.psm1
@@ -95,7 +95,7 @@ Function Invoke-AppVeyorTests() {
         Details = 'Now running all test found in .\tests\ dir.'
     }
     Add-AppveyorMessage @MsgParams
-    $testresults = Invoke-Pester -Path ".\tests\*" -ExcludeTag 'Disabled' -PassThru
+    $testresults = Invoke-Pester -Path ( Get-ChildItem -Path ".\tests\*.Tests.ps1" -Recurse | Sort-Object -Property Name ) -ExcludeTag 'Disabled' -PassThru
     ForEach ($Item in $testresults.TestResult) {
         Switch ($Item.Result) {
             "Passed" {