diff --git a/tests/My Project/AssemblyInfo.vb b/tests/My Project/AssemblyInfo.vb
index dd3dff9b..a5935050 100644
--- a/tests/My Project/AssemblyInfo.vb	
+++ b/tests/My Project/AssemblyInfo.vb	
@@ -1,4 +1,4 @@
-Imports System
+Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 
@@ -11,6 +11,8 @@ Imports System.Runtime.InteropServices
 
 <Assembly: ComVisible(False)>
 
+<Assembly: Parallelize(Scope:=ExecutionScope.MethodLevel)>
+
 <Assembly: Guid("52f7642c-b8dd-494e-8cbc-bc773c3f6e72")>
 
 ' <Assembly: AssemblyVersion("1.0.*")> 
diff --git a/tests/TestWVP.vb b/tests/TestWVP.vb
index 4eb46710..0ebaf650 100644
--- a/tests/TestWVP.vb
+++ b/tests/TestWVP.vb
@@ -42,7 +42,9 @@ Imports Microsoft.VisualStudio.TestTools.UnitTesting
     ''' <summary>
     ''' Tests reading WVP series options
     ''' </summary>
-    <TestMethod()> Public Sub TestWVP_ReadOptions()
+    <DoNotParallelize>
+    <TestMethod>
+    Public Sub TestWVP_ReadOptions()
 
         Dim fileWVP As String = IO.Path.Combine(TestData.getTestDataDir(), "WVP", "test_displayoptions.wvp")
 
@@ -67,7 +69,9 @@ Imports Microsoft.VisualStudio.TestTools.UnitTesting
     ''' <summary>
     ''' Tests writing WVP series options
     ''' </summary>
-    <TestMethod()> Public Sub TestWVP_WriteOptions()
+    <DoNotParallelize>
+    <TestMethod>
+    Public Sub TestWVP_WriteOptions()
 
         'read time series using a WVP file
         Dim fileIn As String = IO.Path.Combine(TestData.getTestDataDir(), "WVP", "test_displayoptions.wvp")
diff --git a/tests/tests.runsettings b/tests/tests.runsettings
index 76fdf26b..c2a081d4 100644
--- a/tests/tests.runsettings
+++ b/tests/tests.runsettings
@@ -3,7 +3,7 @@
   <!-- Configurations that affect the Test Framework -->
   <RunConfiguration>
     <!-- Use 0 for maximum process-level parallelization. This does not force parallelization within the test DLL (on the thread-level). You can also change it from the Test menu; choose "Run tests in parallel". Unchecked = 1 (only 1), checked = 0 (max). -->
-    <MaxCpuCount>1</MaxCpuCount>
+    <MaxCpuCount>0</MaxCpuCount>
     <!-- Path relative to directory that contains .runsettings file-->
     <ResultsDirectory>.\TestResults</ResultsDirectory>
 
@@ -47,6 +47,10 @@
     <AssemblyResolution>
       <Directory path="bin\Debug\x64" includeSubDirectories="false"/>
     </AssemblyResolution>
+    <Parallelize>
+      <Workers>0</Workers>
+      <Scope>MethodLevel</Scope>
+    </Parallelize>
   </MSTest>
 
 </RunSettings>
\ No newline at end of file