diff --git a/BUILD b/BUILD
index 30b996a..c3f7e9a 100644
--- a/BUILD
+++ b/BUILD
@@ -1,11 +1,21 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
+load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS")
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 gerrit_plugin(
-    name = "automerge-plugin",
+    name = "autosubmitter",
     srcs = glob(["src/main/java/**/*.java"]),
     manifest_entries = [
-        "Gerrit-PluginName: automerge-plugin",
+        "Gerrit-PluginName: autosubmitter",
         "Gerrit-Module: com.criteo.gerrit.plugins.automerge.AutomergeModule",
     ],
     resources = glob(["src/main/resources/*"]),
 )
+
+junit_tests(
+    name = "test",
+    testonly = 1,
+    srcs = glob(["src/test/java/**/*.java"]),
+    deps = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
+        ":autosubmitter",
+    ],
+)
diff --git a/README.md b/README.md
index 0be924e..9d5bee0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-automerge-plugin
-================
+Autosubmitter
+=============
 
 [![Build Status](https://gerrit-ci.gerritforge.com/view/Plugins-stable-2.14/job/plugin-automerge-plugin-gh-bazel-stable-2.14/badge/icon)](https://gerrit-ci.gerritforge.com/view/Plugins-stable-2.14/job/plugin-automerge-plugin-gh-bazel-stable-2.14/)