diff --git a/Facepunch.Steamworks.Test/FriendsTest.cs b/Facepunch.Steamworks.Test/FriendsTest.cs
index f8183f9..fb13d85 100644
--- a/Facepunch.Steamworks.Test/FriendsTest.cs
+++ b/Facepunch.Steamworks.Test/FriendsTest.cs
@@ -7,6 +7,7 @@ using Steamworks.Data;
 namespace Steamworks
 {
 	[DeploymentItem( "steam_api64.dll" )]
+	[DeploymentItem( "steam_api.dll" )]
 	[TestClass]
 	public class FriendsTest
 	{
diff --git a/Facepunch.Steamworks.Test/GameServerTest.cs b/Facepunch.Steamworks.Test/GameServerTest.cs
index 6ed4150..090ba6b 100644
--- a/Facepunch.Steamworks.Test/GameServerTest.cs
+++ b/Facepunch.Steamworks.Test/GameServerTest.cs
@@ -5,7 +5,8 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 namespace Steamworks
 {
     [DeploymentItem( "steam_api64.dll" )]
-    [TestClass]
+	[DeploymentItem( "steam_api.dll" )]
+	[TestClass]
     public partial class GameServerTest
     {
         [TestMethod]
diff --git a/Facepunch.Steamworks.Test/InputTest.cs b/Facepunch.Steamworks.Test/InputTest.cs
index 0c425db..b2eb60a 100644
--- a/Facepunch.Steamworks.Test/InputTest.cs
+++ b/Facepunch.Steamworks.Test/InputTest.cs
@@ -11,7 +11,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    [DeploymentItem( "controller_config/game_actions_252490.vdf" )]
+	[DeploymentItem( "steam_api.dll" )]
+	[DeploymentItem( "controller_config/game_actions_252490.vdf" )]
     public class InputTest
 	{
 		[TestMethod]
diff --git a/Facepunch.Steamworks.Test/InventoryTest.cs b/Facepunch.Steamworks.Test/InventoryTest.cs
index 27f04fe..4e8179a 100644
--- a/Facepunch.Steamworks.Test/InventoryTest.cs
+++ b/Facepunch.Steamworks.Test/InventoryTest.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class InventoryTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class InventoryTest
 	{
 		[TestMethod]
 		public async Task LoadItemDefinitionsAsync()
diff --git a/Facepunch.Steamworks.Test/RemoteStorageTest.cs b/Facepunch.Steamworks.Test/RemoteStorageTest.cs
index 157315d..512c5eb 100644
--- a/Facepunch.Steamworks.Test/RemoteStorageTest.cs
+++ b/Facepunch.Steamworks.Test/RemoteStorageTest.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class RemoteStorageTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class RemoteStorageTest
 	{
 		[TestMethod]
         public void Quotas()
diff --git a/Facepunch.Steamworks.Test/ServerlistTest.cs b/Facepunch.Steamworks.Test/ServerlistTest.cs
index 2568564..5a06d77 100644
--- a/Facepunch.Steamworks.Test/ServerlistTest.cs
+++ b/Facepunch.Steamworks.Test/ServerlistTest.cs
@@ -11,7 +11,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public partial class ServerListTest
+	[DeploymentItem( "steam_api.dll" )]
+	public partial class ServerListTest
     {
         [TestMethod]
         public void IpAddressConversions()
diff --git a/Facepunch.Steamworks.Test/SteamMatchmakingTest.cs b/Facepunch.Steamworks.Test/SteamMatchmakingTest.cs
index abfe446..0846e94 100644
--- a/Facepunch.Steamworks.Test/SteamMatchmakingTest.cs
+++ b/Facepunch.Steamworks.Test/SteamMatchmakingTest.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class SteamMatchmakingTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class SteamMatchmakingTest
 	{
 		[TestMethod]
 		public async Task LobbyList()
diff --git a/Facepunch.Steamworks.Test/SteamNetworkingTest.cs b/Facepunch.Steamworks.Test/SteamNetworkingTest.cs
index c07d15e..9c61e2a 100644
--- a/Facepunch.Steamworks.Test/SteamNetworkingTest.cs
+++ b/Facepunch.Steamworks.Test/SteamNetworkingTest.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class SteamNetworkingTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class SteamNetworkingTest
     {
 		[TestMethod]
         public async Task SendP2PPacket()
diff --git a/Facepunch.Steamworks.Test/UgcEditor.cs b/Facepunch.Steamworks.Test/UgcEditor.cs
index 6edba5d..ab222b1 100644
--- a/Facepunch.Steamworks.Test/UgcEditor.cs
+++ b/Facepunch.Steamworks.Test/UgcEditor.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class UgcEditor
+	[DeploymentItem( "steam_api.dll" )]
+	public class UgcEditor
     {
 		[TestMethod]
         public async Task CreateFile()
diff --git a/Facepunch.Steamworks.Test/UgcQuery.cs b/Facepunch.Steamworks.Test/UgcQuery.cs
index 041e4f5..254141e 100644
--- a/Facepunch.Steamworks.Test/UgcQuery.cs
+++ b/Facepunch.Steamworks.Test/UgcQuery.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class UgcQueryTests
+	[DeploymentItem( "steam_api.dll" )]
+	public class UgcQueryTests
     {
 		[TestMethod]
         public async Task QueryAll()
diff --git a/Facepunch.Steamworks.Test/UgcTest.cs b/Facepunch.Steamworks.Test/UgcTest.cs
index 9c15019..14ab767 100644
--- a/Facepunch.Steamworks.Test/UgcTest.cs
+++ b/Facepunch.Steamworks.Test/UgcTest.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class UgcTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class UgcTest
     {
 		[TestMethod]
         public void Download()
diff --git a/Facepunch.Steamworks.Test/UserStatsTest.cs b/Facepunch.Steamworks.Test/UserStatsTest.cs
index 1f41180..3e622fe 100644
--- a/Facepunch.Steamworks.Test/UserStatsTest.cs
+++ b/Facepunch.Steamworks.Test/UserStatsTest.cs
@@ -10,7 +10,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class UserStatsTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class UserStatsTest
 	{
 		[TestMethod]
         public async Task AchievementList()
diff --git a/Facepunch.Steamworks.Test/UserTest.cs b/Facepunch.Steamworks.Test/UserTest.cs
index 48ef38e..9ddcf4b 100644
--- a/Facepunch.Steamworks.Test/UserTest.cs
+++ b/Facepunch.Steamworks.Test/UserTest.cs
@@ -11,7 +11,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class UserTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class UserTest
     {
 		[TestMethod]
 		public void GetVoice()
diff --git a/Facepunch.Steamworks.Test/UtilsTest.cs b/Facepunch.Steamworks.Test/UtilsTest.cs
index 05b4cf7..225faec 100644
--- a/Facepunch.Steamworks.Test/UtilsTest.cs
+++ b/Facepunch.Steamworks.Test/UtilsTest.cs
@@ -9,7 +9,8 @@ namespace Steamworks
 {
     [TestClass]
     [DeploymentItem( "steam_api64.dll" )]
-    public class UtilsTest
+	[DeploymentItem( "steam_api.dll" )]
+	public class UtilsTest
     {
 		[TestMethod]
         public void SecondsSinceAppActive()