diff --git a/its/environments/ibm-jdk8/Dockerfile b/its/environments/ibm-jdk8/Dockerfile
new file mode 100644
index 0000000000..12e002832b
--- /dev/null
+++ b/its/environments/ibm-jdk8/Dockerfile
@@ -0,0 +1,33 @@
+# 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.
+
+FROM ibmjava:8-sdk
+
+RUN apt-get update &&\
+    apt-get install -y --no-install-recommends git curl &&\
+    rm -rf /var/lib/apt/lists/*
+
+ARG MAVEN_VERSION=3.3.9
+ARG USER_HOME_DIR="/root"
+
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref &&\
+    curl -fsSL http://apache.osuosl.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \
+    | tar -xzC /usr/share/maven --strip-components=1 &&\
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
diff --git a/its/environments/solaris-11-jdk7/.gitignore b/its/environments/solaris-11-jdk7/.gitignore
new file mode 100644
index 0000000000..a977916f65
--- /dev/null
+++ b/its/environments/solaris-11-jdk7/.gitignore
@@ -0,0 +1 @@
+.vagrant/
diff --git a/its/environments/solaris-11-jdk7/Vagrantfile b/its/environments/solaris-11-jdk7/Vagrantfile
new file mode 100644
index 0000000000..245e3b6de8
--- /dev/null
+++ b/its/environments/solaris-11-jdk7/Vagrantfile
@@ -0,0 +1,46 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# 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.
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "jonatasbaldin/solaris11"
+  #config.ssh.password = "v@grant"
+
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 2048
+    v.cpus = 2
+  end
+
+  config.vm.provision "file", source:"apache-maven-3.3.9.patch", destination:"apache-maven-3.3.9.patch"
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo sudo pkg install --accept jdk-7 git &&\
+    wget --no-check-certificate https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz &&\
+    gunzip -c apache-maven-3.3.9-bin.tar.gz | sudo sh -c "cd /opt; tar xf - " 2>&1 &&\
+    sudo patch -i apache-maven-3.3.9.patch /opt/apache-maven-3.3.9/bin/mvn &&\
+    sudo ln -s /opt/apache-maven-3.3.9/bin/mvn /usr/bin/mvn &&\
+    rm -rf apache-maven-3.3.9-bin.tar.gz apache-maven-3.3.9.patch &&\
+    sudo sh -c "echo JAVA_HOME=/usr/jdk/latest >> /etc/profile" &&\
+    sudo sh -c "echo export JAVA_HOME >> /etc/profile" &&\
+    sudo sh -c "echo MAVEN_HOME=/opt/apache-maven-3.3.9 >> /etc/profile" &&\
+    sudo sh -c "echo export MAVEN_HOME >> /etc/profile" &&\
+    sudo sh -c "echo PATH=${MAVEN_HOME}/bin:${PATH} >> /etc/profile" &&\
+    sudo sh -c "echo export PATH >> /etc/profile"
+  SHELL
+
+end
diff --git a/its/environments/solaris-11-jdk7/apache-maven-3.3.9.patch b/its/environments/solaris-11-jdk7/apache-maven-3.3.9.patch
new file mode 100644
index 0000000000..ae39c8b005
--- /dev/null
+++ b/its/environments/solaris-11-jdk7/apache-maven-3.3.9.patch
@@ -0,0 +1,8 @@
+200,203c200,201
+<   local basedir
+<   local wdir
+<   basedir="$(pwd)"
+<   wdir="$(pwd)"
+---
+>   basedir=`pwd`
+>   wdir=`pwd`
diff --git a/its/environments/solaris-11-jdk8/.gitignore b/its/environments/solaris-11-jdk8/.gitignore
new file mode 100644
index 0000000000..a977916f65
--- /dev/null
+++ b/its/environments/solaris-11-jdk8/.gitignore
@@ -0,0 +1 @@
+.vagrant/
diff --git a/its/environments/solaris-11-jdk8/Vagrantfile b/its/environments/solaris-11-jdk8/Vagrantfile
new file mode 100644
index 0000000000..b8c535f519
--- /dev/null
+++ b/its/environments/solaris-11-jdk8/Vagrantfile
@@ -0,0 +1,46 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# 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.
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "jonatasbaldin/solaris11"
+  #config.ssh.password = "v@grant"
+
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 2048
+    v.cpus = 2
+  end
+
+  config.vm.provision "file", source:"apache-maven-3.3.9.patch", destination:"apache-maven-3.3.9.patch"
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo sudo pkg install --accept jdk-8 git &&\
+    wget --no-check-certificate https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz &&\
+    gunzip -c apache-maven-3.3.9-bin.tar.gz | sudo sh -c "cd /opt; tar xf - " 2>&1 &&\
+    sudo patch -i apache-maven-3.3.9.patch /opt/apache-maven-3.3.9/bin/mvn &&\
+    sudo ln -s /opt/apache-maven-3.3.9/bin/mvn /usr/bin/mvn &&\
+    rm -rf apache-maven-3.3.9-bin.tar.gz apache-maven-3.3.9.patch &&\
+    sudo sh -c "echo JAVA_HOME=/usr/jdk/latest >> /etc/profile" &&\
+    sudo sh -c "echo export JAVA_HOME >> /etc/profile" &&\
+    sudo sh -c "echo MAVEN_HOME=/opt/apache-maven-3.3.9 >> /etc/profile" &&\
+    sudo sh -c "echo export MAVEN_HOME >> /etc/profile" &&\
+    sudo sh -c "echo PATH=${MAVEN_HOME}/bin:${PATH} >> /etc/profile" &&\
+    sudo sh -c "echo export PATH >> /etc/profile"
+  SHELL
+
+end
diff --git a/its/environments/solaris-11-jdk8/apache-maven-3.3.9.patch b/its/environments/solaris-11-jdk8/apache-maven-3.3.9.patch
new file mode 100644
index 0000000000..ae39c8b005
--- /dev/null
+++ b/its/environments/solaris-11-jdk8/apache-maven-3.3.9.patch
@@ -0,0 +1,8 @@
+200,203c200,201
+<   local basedir
+<   local wdir
+<   basedir="$(pwd)"
+<   wdir="$(pwd)"
+---
+>   basedir=`pwd`
+>   wdir=`pwd`
diff --git a/its/environments/zulu-jdk8/Dockerfile b/its/environments/zulu-jdk8/Dockerfile
new file mode 100644
index 0000000000..557c0bb387
--- /dev/null
+++ b/its/environments/zulu-jdk8/Dockerfile
@@ -0,0 +1,34 @@
+# 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.
+
+FROM azul/zulu-openjdk:8
+
+RUN apt-get update &&\
+    apt-get upgrade -y ca-certificates &&\
+    apt-get install -y --no-install-recommends git curl &&\
+    rm -rf /var/lib/apt/lists/*
+
+ARG MAVEN_VERSION=3.3.9
+ARG USER_HOME_DIR="/root"
+
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+  && curl -fsSL http://apache.osuosl.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \
+    | tar -xzC /usr/share/maven --strip-components=1 \
+  && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"