diff --git a/tests/src/main/scala/org/apache/openwhisk/GradleWorkaround.scala b/tests/src/main/scala/org/apache/openwhisk/GradleWorkaround.scala
new file mode 100644
index 00000000000..e798f11f85e
--- /dev/null
+++ b/tests/src/main/scala/org/apache/openwhisk/GradleWorkaround.scala
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.openwhisk
+
+/**
+ *  This class is a workaround for https://github.com/gradle/gradle/issues/6849
+ */
+class GradleWorkaround {}