diff --git a/gradle.properties b/gradle.properties
index 2dabf786..f934bcc0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.17-pre1
-supported_version=1.17-pre1
+minecraft_version=1.17-pre2
+supported_version=1.17-pre2
 
 cf_type=beta
 
diff --git a/testmod-common/src/main/java/dev/architectury/test/TestMod.java b/testmod-common/src/main/java/dev/architectury/test/TestMod.java
index 302c32ac..91ab5f2b 100644
--- a/testmod-common/src/main/java/dev/architectury/test/TestMod.java
+++ b/testmod-common/src/main/java/dev/architectury/test/TestMod.java
@@ -33,6 +33,8 @@ import dev.architectury.test.tags.TestTags;
 import dev.architectury.test.trade.TestTrades;
 import dev.architectury.utils.Env;
 import dev.architectury.utils.EnvExecutor;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.model.geom.ModelLayers;
 import net.minecraft.client.renderer.entity.MinecartRenderer;
 
@@ -51,6 +53,7 @@ public class TestMod {
         }
     }
     
+    @Environment(EnvType.CLIENT)
     public static void initializeClient() {
         TestKeybinds.initialize();
         EntityRendererRegistry.register(TestEntity.TYPE, context ->