diff --git a/completions/go.fish b/completions/go.fish
new file mode 100644
index 0000000..f4cc5d3
--- /dev/null
+++ b/completions/go.fish
@@ -0,0 +1,13 @@
+function __cache_or_get_go_completion -d "Create go completions"
+    mkdir -p "/tmp/go_completion_cache_for_$USER"
+	set -l hashed_pwd (echo (pwd) | md5sum | cut -d " " -f 1)
+	set -l go_cache_file "/tmp/go_completion_cache_for_$USER/$hashed_pwd"
+	
+	if not test -f "$go_cache_file"
+		go -T 2>&1 | grep "^go" |cut -d " " -f 2 > "$go_cache_file"
+	end
+	
+	cat "$go_cache_file"
+end
+
+complete -x -c go -a "(__cache_or_get_go_completion)" --description 'go Task'
\ No newline at end of file
diff --git a/functions/go.fish b/functions/go.fish
new file mode 100644
index 0000000..08fe79f
--- /dev/null
+++ b/functions/go.fish
@@ -0,0 +1,3 @@
+function go
+	./go $argv
+end
\ No newline at end of file
diff --git a/functions/gridtest.fish b/functions/gridtest.fish
new file mode 100644
index 0000000..fbe5ba0
--- /dev/null
+++ b/functions/gridtest.fish
@@ -0,0 +1,3 @@
+function gridtest
+    ./go //java/server/test/org/openqa/grid:test:run
+end
\ No newline at end of file