diff --git a/lua/runner/handlers/init.lua b/lua/runner/handlers/init.lua
index e03d92b..bcb3f1f 100644
--- a/lua/runner/handlers/init.lua
+++ b/lua/runner/handlers/init.lua
@@ -7,6 +7,7 @@ local handlers = {
   javascript = require('runner.handlers.languages.nodejs'),
   typescript = require('runner.handlers.languages.nodejs'),
   vue = require('runner.handlers.languages.nodejs'),
+  go = require('runner.handlers.languages.go'),
 }
 
 return handlers
diff --git a/lua/runner/handlers/languages/go.lua b/lua/runner/handlers/languages/go.lua
new file mode 100644
index 0000000..8b225d2
--- /dev/null
+++ b/lua/runner/handlers/languages/go.lua
@@ -0,0 +1,10 @@
+local helpers = require('runner.handlers.helpers')
+
+return function(buffer)
+  local handlers = {
+    ['Run'] = helpers.shell_handler('go run .'),
+    ['Test'] = helpers.shell_handler('go test .'),
+    ['Custom'] = helpers.shell_handler('go ', true),
+  }
+  helpers.choice(handlers)(buffer)
+end