diff --git a/src/main/java/net/fabricmc/loom/task/CleanLoomBinaries.java b/src/main/java/net/fabricmc/loom/task/CleanLoomBinaries.java
index 3b477c6..116f236 100644
--- a/src/main/java/net/fabricmc/loom/task/CleanLoomBinaries.java
+++ b/src/main/java/net/fabricmc/loom/task/CleanLoomBinaries.java
@@ -25,11 +25,10 @@
 package net.fabricmc.loom.task;
 
 import net.fabricmc.loom.LoomGradleExtension;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.TaskAction;
 
-public class CleanLoomBinaries extends DefaultTask {
+public class CleanLoomBinaries extends DefaultLoomTask {
     @TaskAction
     public void run() {
         Project project = this.getProject();
diff --git a/src/main/java/net/fabricmc/loom/task/CleanLoomMappings.java b/src/main/java/net/fabricmc/loom/task/CleanLoomMappings.java
index 54eb50f..05c586b 100644
--- a/src/main/java/net/fabricmc/loom/task/CleanLoomMappings.java
+++ b/src/main/java/net/fabricmc/loom/task/CleanLoomMappings.java
@@ -26,14 +26,13 @@ package net.fabricmc.loom.task;
 
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.util.DeletingFileVisitor;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.IOException;
 import java.nio.file.Files;
 
-public class CleanLoomMappings extends DefaultTask {
+public class CleanLoomMappings extends DefaultLoomTask {
     @TaskAction
     public void run() {
         Project project = this.getProject();
diff --git a/src/main/java/net/fabricmc/loom/task/DefaultLoomTask.java b/src/main/java/net/fabricmc/loom/task/DefaultLoomTask.java
new file mode 100644
index 0000000..c7ecba3
--- /dev/null
+++ b/src/main/java/net/fabricmc/loom/task/DefaultLoomTask.java
@@ -0,0 +1,11 @@
+package net.fabricmc.loom.task;
+
+import org.gradle.api.DefaultTask;
+
+public abstract class DefaultLoomTask extends DefaultTask {
+
+	public DefaultLoomTask() {
+		setGroup("fabric");
+	}
+
+}
diff --git a/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java b/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java
index b238327..1ff14b2 100644
--- a/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java
@@ -26,14 +26,13 @@ package net.fabricmc.loom.task;
 
 import net.fabricmc.loom.util.RunConfig;
 import org.apache.commons.io.FileUtils;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-public class GenEclipseRunsTask extends DefaultTask {
+public class GenEclipseRunsTask extends DefaultLoomTask {
 
     @TaskAction
     public void genRuns() throws IOException {
diff --git a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java
index 4dcd468..d7b5623 100644
--- a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java
@@ -26,7 +26,6 @@ package net.fabricmc.loom.task;
 
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.util.RunConfig;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.TaskAction;
 import org.w3c.dom.Document;
@@ -46,7 +45,7 @@ import javax.xml.transform.stream.StreamResult;
 import java.io.File;
 import java.io.IOException;
 
-public class GenIdeaProjectTask extends DefaultTask {
+public class GenIdeaProjectTask extends DefaultLoomTask {
 
 	@TaskAction
 	public void genIdeaRuns() throws IOException, ParserConfigurationException, SAXException, TransformerException {
diff --git a/src/main/java/net/fabricmc/loom/task/GenSourcesCfrTask.java b/src/main/java/net/fabricmc/loom/task/GenSourcesCfrTask.java
index d989035..4bb0568 100644
--- a/src/main/java/net/fabricmc/loom/task/GenSourcesCfrTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenSourcesCfrTask.java
@@ -24,9 +24,7 @@
 
 package net.fabricmc.loom.task;
 
-import org.gradle.api.DefaultTask;
-
-public class GenSourcesCfrTask extends DefaultTask {
+public class GenSourcesCfrTask extends DefaultLoomTask {
 	/*
 	@TaskAction
 	public void genSources() throws IOException {
diff --git a/src/main/java/net/fabricmc/loom/task/GenSourcesTask.java b/src/main/java/net/fabricmc/loom/task/GenSourcesTask.java
index d8a8387..51d65f9 100644
--- a/src/main/java/net/fabricmc/loom/task/GenSourcesTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenSourcesTask.java
@@ -28,7 +28,6 @@ import com.google.common.io.ByteStreams;
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.providers.MappingsProvider;
 import net.fabricmc.loom.providers.MinecraftLibraryProvider;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.TaskAction;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
@@ -40,10 +39,12 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 import java.util.jar.*;
 
-public class GenSourcesTask extends DefaultTask {
+public class GenSourcesTask extends DefaultLoomTask {
 	public static File getSourcesJar(Project project) {
 		LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
 		MappingsProvider mappingsProvider = extension.getMappingsProvider();
diff --git a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
index 09d186d..5416bff 100644
--- a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
@@ -29,7 +29,6 @@ import com.google.gson.GsonBuilder;
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.util.RunConfig;
 import org.apache.commons.io.FileUtils;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
@@ -42,7 +41,7 @@ import java.util.List;
 // https://marketplace.visualstudio.com/items?itemName=redhat.java
 // https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-debug
 // https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-pack
-public class GenVsCodeProjectTask extends DefaultTask {
+public class GenVsCodeProjectTask extends DefaultLoomTask {
 
     @TaskAction
     public void genRuns() {
diff --git a/src/main/java/net/fabricmc/loom/task/RemapJar.java b/src/main/java/net/fabricmc/loom/task/RemapJar.java
index c837dfc..5cbdfaa 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapJar.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapJar.java
@@ -25,15 +25,12 @@
 package net.fabricmc.loom.task;
 
 import net.fabricmc.loom.util.ModRemapper;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.jvm.tasks.Jar;
 
 import java.io.File;
 
-public class RemapJar extends DefaultTask {
+public class RemapJar extends DefaultLoomTask {
 	public File jar;
 
 	@Input
diff --git a/src/main/java/net/fabricmc/loom/task/RemapSourcesJar.java b/src/main/java/net/fabricmc/loom/task/RemapSourcesJar.java
index afcb0b2..094f439 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapSourcesJar.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapSourcesJar.java
@@ -25,13 +25,12 @@
 package net.fabricmc.loom.task;
 
 import net.fabricmc.loom.util.SourceRemapper;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
 
-public class RemapSourcesJar extends DefaultTask {
+public class RemapSourcesJar extends DefaultLoomTask {
 	public File jar;
 	public String direction = "intermediary";
 
diff --git a/src/main/java/net/fabricmc/loom/task/RunClientTask.java b/src/main/java/net/fabricmc/loom/task/RunClientTask.java
index 2b3cec2..7554e1d 100644
--- a/src/main/java/net/fabricmc/loom/task/RunClientTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RunClientTask.java
@@ -36,6 +36,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class RunClientTask extends JavaExec {
+	public RunClientTask() {
+		setGroup("fabric");
+	}
 
 	@Override
 	public void exec() {
diff --git a/src/main/java/net/fabricmc/loom/task/RunServerTask.java b/src/main/java/net/fabricmc/loom/task/RunServerTask.java
index 67b3299..e7d34c4 100644
--- a/src/main/java/net/fabricmc/loom/task/RunServerTask.java
+++ b/src/main/java/net/fabricmc/loom/task/RunServerTask.java
@@ -33,6 +33,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class RunServerTask extends JavaExec {
+	public RunServerTask() {
+		setGroup("fabric");
+	}
 
 	@Override
 	public void exec() {