diff --git a/build.gradle b/build.gradle
index 3df322c..ac3c696 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,7 +169,6 @@ jar {
 
 
 test {
-    useJUnitPlatform()
 
     //we do not need to check classpath hell for testing
     systemProperty "tests.jarhell.check", "false"
diff --git a/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkConnector.java b/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkConnector.java
index 32a46cb..1f391a2 100644
--- a/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkConnector.java
+++ b/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkConnector.java
@@ -34,7 +34,7 @@ public class ElasticsearchSinkConnector extends SinkConnector {
 
     @Override
     public String version() {
-        return Version.getVersion();
+        return Version.VERSION;
     }
 
     @Override
diff --git a/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkTask.java b/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkTask.java
index 659cc73..7bb3a6c 100644
--- a/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkTask.java
+++ b/src/main/java/io/aiven/connect/elasticsearch/ElasticsearchSinkTask.java
@@ -47,7 +47,7 @@ public class ElasticsearchSinkTask extends SinkTask {
 
     @Override
     public String version() {
-        return Version.getVersion();
+        return Version.VERSION;
     }
 
     @Override
diff --git a/src/main/java/io/aiven/connect/elasticsearch/Version.java b/src/main/java/io/aiven/connect/elasticsearch/Version.java
index be4892c..655b8d2 100644
--- a/src/main/java/io/aiven/connect/elasticsearch/Version.java
+++ b/src/main/java/io/aiven/connect/elasticsearch/Version.java
@@ -25,23 +25,18 @@
 
 public class Version {
     private static final Logger log = LoggerFactory.getLogger(Version.class);
-    private static String version = "unknown";
+    private static final String PROPERTIES_FILENAME = "elasticsearch-connector-for-apache-kafka-version.properties";
 
-    private static final String VERSION_FILE = "/aiven-kafka-connect-elasticsearch-version.properties";
+    static final String VERSION;
 
     static {
-        try {
-            final Properties props = new Properties();
-            try (InputStream versionFileStream = Version.class.getResourceAsStream(VERSION_FILE)) {
-                props.load(versionFileStream);
-                version = props.getProperty("version", version).trim();
-            }
+        final Properties props = new Properties();
+        try (final InputStream resourceStream =
+                 Version.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME)) {
+            props.load(resourceStream);
         } catch (final Exception e) {
-            log.warn("Error while loading version:", e);
+            log.warn("Error while loading {}: {}", PROPERTIES_FILENAME, e.getMessage());
         }
-    }
-
-    public static String getVersion() {
-        return version;
+        VERSION = props.getProperty("version", "unknown").trim();
     }
 }
diff --git a/src/main/resources/aiven-kafka-connect-elasticsearch-version.properties b/src/main/resources/elasticsearch-connector-for-apache-kafka-version.properties
similarity index 86%
rename from src/main/resources/aiven-kafka-connect-elasticsearch-version.properties
rename to src/main/resources/elasticsearch-connector-for-apache-kafka-version.properties
index 3b40811..9d05fec 100644
--- a/src/main/resources/aiven-kafka-connect-elasticsearch-version.properties
+++ b/src/main/resources/elasticsearch-connector-for-apache-kafka-version.properties
@@ -1,6 +1,5 @@
 ##
-# Copyright 2019 Aiven Oy
-# Copyright 2016 Confluent Inc.
+# Copyright 2020 Aiven Oy
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
-version=${version ?: 'unknown'}
\ No newline at end of file
+version=${version ?: 'unknown'}