diff --git a/hawkbit-artifact/hawkbit-artifact-api/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java b/hawkbit-artifact/hawkbit-artifact-api/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java
index e07260312..100af94e0 100644
--- a/hawkbit-artifact/hawkbit-artifact-api/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java
+++ b/hawkbit-artifact/hawkbit-artifact-api/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java
@@ -119,7 +119,12 @@ public abstract class AbstractArtifactRepository implements ArtifactRepository {
             }
             // try, if not supported - ok
             if (!file.setExecutable(false)) {
-                log.debug("Can't set executable permissions for temp file {}", file);
+                log.debug("Can't remove executable permissions for temp file {}", file);
+            }
+            if (directory) {
+                if (!file.setExecutable(true, true)) {
+                    log.debug("Can't set executable permissions for temp directory {} for the owner", file);
+                }
             }
             return file;
         } catch (final IOException e) {
diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
index a8aa690c5..246472a65 100644
--- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
+++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
@@ -487,8 +487,7 @@ public abstract class AbstractIntegrationTest {
         try {
             final File file = Files.createTempFile(String.valueOf(System.currentTimeMillis()), "hawkbit_test").toFile();
             file.deleteOnExit();
-            if (!file.setReadable(true, true) ||
-                    !file.setWritable(true, true)) {
+            if (!file.setReadable(true, true) || !file.setWritable(true, true)) {
                 if (file.delete()) { // try to delete immediately, if failed - on exit
                     throw new IOException("Can't set proper permissions!");
                 } else {
@@ -497,7 +496,7 @@ public abstract class AbstractIntegrationTest {
             }
             // try, if not supported - ok
             if (!file.setExecutable(false)) {
-                log.debug("Can't set executable permissions for temp file {}", file);
+                log.debug("Can't remove executable permissions for temp file {}", file);
             }
             return file;
         } catch (final IOException e) {