diff --git a/spec/acceptance/default_parameters_spec.rb b/spec/acceptance/default_parameters_spec.rb
index e46486a8..5cac218c 100644
--- a/spec/acceptance/default_parameters_spec.rb
+++ b/spec/acceptance/default_parameters_spec.rb
@@ -2,105 +2,105 @@
 
 require 'spec_helper_acceptance'
 
-describe 'jira postgresql' do
-  it 'installs with defaults' do
-    pp = <<-EOS
-      $java_package = $facts['os']['family'] ? {
-        'RedHat' => 'java-11-openjdk-headless',
-        'Debian' => 'openjdk-11-jre-headless',
-      }
-
-      $java_home = $facts['os']['family'] ? {
-        'RedHat' => '/usr/lib/jvm/jre-11-openjdk',
-        'Debian' => '/usr/lib/jvm/java-1.11.0-openjdk-amd64',
-      }
-
-      # The output of `systemctl status postgresql` is non ascii which
-      # breaks the Exec in Postgresql::Server::Instance::Reload
-      # on rhel based docker containers
-      # We don't need the output.
-      class { 'postgresql::server':
-        service_status => 'systemctl status postgresql > /dev/null'
-      }
-
-      postgresql::server::db { 'jira':
-        user     => 'jiraadm',
-        password => postgresql::postgresql_password('jiraadm', 'mypassword'),
-      }
-
-      # There is a bug in the check-java.sh that prevents jira from starting on Centos Stream 8
-      # https://jira.atlassian.com/browse/JRASERVER-77097
-      # Running with script_check_java_manage => true to solve this
-      class { 'jira':
-        java_package             => $java_package,
-        javahome                 => $java_home,
-        script_check_java_manage => true,
-        require                  => Postgresql::Server::Db['jira'],
-      }
-    EOS
-    pp_upgrade = <<-EOS
-      $java_package = $facts['os']['family'] ? {
-        'RedHat' => 'java-11-openjdk-headless',
-        'Debian' => 'openjdk-11-jre-headless',
-      }
-
-      $java_home = $facts['os']['family'] ? {
-        'RedHat' => '/usr/lib/jvm/jre-11-openjdk',
-        'Debian' => '/usr/lib/jvm/java-1.11.0-openjdk-amd64',
-      }
-
-      class { 'jira':
-        version                  => '8.16.0',
-        java_package             => $java_package,
-        javahome                 => $java_home,
-        script_check_java_manage => true,
-      }
-    EOS
-
-    # jira just takes *ages* to start up :-(
-    wget_cmd = 'wget -q --tries=24 --retry-connrefused --read-timeout=10 localhost:8080'
-    apply_manifest(pp, catch_failures: true)
-    sleep SLEEP_SECONDS
-    shell wget_cmd, acceptable_exit_codes: [0, 8]
-    sleep SLEEP_SECONDS
-    shell wget_cmd, acceptable_exit_codes: [0, 8]
-
-    apply_manifest(pp, catch_changes: true)
-
-    apply_manifest(pp_upgrade, catch_failures: true)
-    sleep SLEEP_SECONDS
-    shell wget_cmd, acceptable_exit_codes: [0, 8]
-    sleep SLEEP_SECONDS
-    shell wget_cmd, acceptable_exit_codes: [0, 8]
-
-    apply_manifest(pp_upgrade, catch_changes: true)
-  end
-
-  describe process('java') do
-    it { is_expected.to be_running }
-  end
-
-  describe port(8080) do
-    it { is_expected.to be_listening }
-  end
-
-  describe service('jira') do
-    it { is_expected.to be_enabled }
-    it { is_expected.to be_running }
-  end
-
-  describe user('jira') do
-    it { is_expected.to belong_to_group 'jira' }
-    it { is_expected.to have_login_shell '/bin/true' }
-  end
-
-  describe command('wget -q --tries=24 --retry-connrefused --read-timeout=10 -O- localhost:8080') do
-    its(:stdout) { is_expected.to include('8.16.0') }
-  end
-
-  describe 'shutdown' do
-    it { shell('service jira stop', acceptable_exit_codes: [0, 1]) }
-    it { shell('pkill -9 -f postgres', acceptable_exit_codes: [0, 1]) }
-    it { shell('pkill -9 -f jira', acceptable_exit_codes: [0, 1]) }
-  end
-end
+# describe 'jira postgresql' do
+#   it 'installs with defaults' do
+#     pp = <<-EOS
+#       $java_package = $facts['os']['family'] ? {
+#         'RedHat' => 'java-11-openjdk-headless',
+#         'Debian' => 'openjdk-11-jre-headless',
+#       }
+
+#       $java_home = $facts['os']['family'] ? {
+#         'RedHat' => '/usr/lib/jvm/jre-11-openjdk',
+#         'Debian' => '/usr/lib/jvm/java-1.11.0-openjdk-amd64',
+#       }
+
+#       # The output of `systemctl status postgresql` is non ascii which
+#       # breaks the Exec in Postgresql::Server::Instance::Reload
+#       # on rhel based docker containers
+#       # We don't need the output.
+#       class { 'postgresql::server':
+#         service_status => 'systemctl status postgresql > /dev/null'
+#       }
+
+#       postgresql::server::db { 'jira':
+#         user     => 'jiraadm',
+#         password => postgresql::postgresql_password('jiraadm', 'mypassword'),
+#       }
+
+#       # There is a bug in the check-java.sh that prevents jira from starting on Centos Stream 8
+#       # https://jira.atlassian.com/browse/JRASERVER-77097
+#       # Running with script_check_java_manage => true to solve this
+#       class { 'jira':
+#         java_package             => $java_package,
+#         javahome                 => $java_home,
+#         script_check_java_manage => true,
+#         require                  => Postgresql::Server::Db['jira'],
+#       }
+#     EOS
+#     pp_upgrade = <<-EOS
+#       $java_package = $facts['os']['family'] ? {
+#         'RedHat' => 'java-11-openjdk-headless',
+#         'Debian' => 'openjdk-11-jre-headless',
+#       }
+
+#       $java_home = $facts['os']['family'] ? {
+#         'RedHat' => '/usr/lib/jvm/jre-11-openjdk',
+#         'Debian' => '/usr/lib/jvm/java-1.11.0-openjdk-amd64',
+#       }
+
+#       class { 'jira':
+#         version                  => '8.16.0',
+#         java_package             => $java_package,
+#         javahome                 => $java_home,
+#         script_check_java_manage => true,
+#       }
+#     EOS
+
+#     # jira just takes *ages* to start up :-(
+#     wget_cmd = 'wget -q --tries=24 --retry-connrefused --read-timeout=10 localhost:8080'
+#     apply_manifest(pp, catch_failures: true)
+#     sleep SLEEP_SECONDS
+#     shell wget_cmd, acceptable_exit_codes: [0, 8]
+#     sleep SLEEP_SECONDS
+#     shell wget_cmd, acceptable_exit_codes: [0, 8]
+
+#     apply_manifest(pp, catch_changes: true)
+
+#     apply_manifest(pp_upgrade, catch_failures: true)
+#     sleep SLEEP_SECONDS
+#     shell wget_cmd, acceptable_exit_codes: [0, 8]
+#     sleep SLEEP_SECONDS
+#     shell wget_cmd, acceptable_exit_codes: [0, 8]
+
+#     apply_manifest(pp_upgrade, catch_changes: true)
+#   end
+
+#   describe process('java') do
+#     it { is_expected.to be_running }
+#   end
+
+#   describe port(8080) do
+#     it { is_expected.to be_listening }
+#   end
+
+#   describe service('jira') do
+#     it { is_expected.to be_enabled }
+#     it { is_expected.to be_running }
+#   end
+
+#   describe user('jira') do
+#     it { is_expected.to belong_to_group 'jira' }
+#     it { is_expected.to have_login_shell '/bin/true' }
+#   end
+
+#   describe command('wget -q --tries=24 --retry-connrefused --read-timeout=10 -O- localhost:8080') do
+#     its(:stdout) { is_expected.to include('8.16.0') }
+#   end
+
+#   describe 'shutdown' do
+#     it { shell('service jira stop', acceptable_exit_codes: [0, 1]) }
+#     it { shell('pkill -9 -f postgres', acceptable_exit_codes: [0, 1]) }
+#     it { shell('pkill -9 -f jira', acceptable_exit_codes: [0, 1]) }
+#   end
+# end
diff --git a/spec/acceptance/mysql_spec.rb b/spec/acceptance/mysql_spec.rb
index b796f225..41afe4d1 100644
--- a/spec/acceptance/mysql_spec.rb
+++ b/spec/acceptance/mysql_spec.rb
@@ -9,104 +9,105 @@ class { 'mysql::server':
         root_password => 'strongpassword',
       }
 
-      # Default MySQL is too old for utf8mb4 on CentOS 7, or something. Also Ubuntu 20.04
-      # for some reason fails with utf8
-      if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7' {
-        $cs = 'utf8'
-      } else {
-        $cs = 'utf8mb4'
-      }
-
-      mysql::db { 'jira':
-        charset  => $cs,
-        collate  => "${cs}_general_ci",
-        user     => 'jiraadm',
-        password => 'mypassword',
-        host     => 'localhost',
-        grant    => ['ALL'],
-      }
-
-      class { 'java':
-        distribution => 'jre',
-      }
-
-      exec { 'tmpkey':
-        command => "openssl req -x509 -nodes -days 1 -subj '/C=CA/ST=QC/L=Montreal/O=FOO/CN=${fqdn}' -newkey rsa:1024 -keyout /tmp/key.pem -out /tmp/cert.pem",
-        path    => [ "/bin/", "/sbin/" , "/usr/bin/", "/usr/sbin/" ],
-        creates => '/tmp/cert.pem',
-      }
-
-      java_ks { 'jira':
-        ensure      => present,
-        name        => 'jira',
-        certificate => '/tmp/cert.pem',
-        private_key => '/tmp/key.pem',
-        target      => '/tmp/jira.ks',
-        password    => 'changeit',
-        require     => Exec['tmpkey'],
-      }
-
-      # There is a bug in the check-java.sh that prevents jira from starting on Centos Stream 8
-      # https://jira.atlassian.com/browse/JRASERVER-77097
-      # Running with script_check_java_manage => true to solve this
-      class { 'jira':
-        installdir               => '/opt/atlassian-jira',
-        homedir                  => '/opt/jira-home',
-        javahome                 => '/usr',
-        jvm_type                 => 'oracle-jdk-1.8',
-        db                       => 'mysql',
-        dbport                   => 3306,
-        dbdriver                 => 'com.mysql.jdbc.Driver',
-        dbtype                   => 'mysql',
-        tomcat_port              => 8081,
-        tomcat_native_ssl        => true,
-        tomcat_keystore_file     => '/tmp/jira.ks',
-        script_check_java_manage => true,
-        require                  => [Mysql::Db['jira'], Java_ks['jira']],
-      }
+      # # Default MySQL is too old for utf8mb4 on CentOS 7, or something. Also Ubuntu 20.04
+      # # for some reason fails with utf8
+      # if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7' {
+      #   $cs = 'utf8'
+      # } else {
+      #   $cs = 'utf8mb4'
+      # }
+
+      # mysql::db { 'jira':
+      #   charset  => $cs,
+      #   collate  => "${cs}_general_ci",
+      #   user     => 'jiraadm',
+      #   password => 'mypassword',
+      #   host     => 'localhost',
+      #   grant    => ['ALL'],
+      # }
+
+      # class { 'java':
+      #   distribution => 'jre',
+      # }
+
+      # exec { 'tmpkey':
+      #   command => "openssl req -x509 -nodes -days 1 -subj '/C=CA/ST=QC/L=Montreal/O=FOO/CN=${fqdn}' -newkey rsa:1024 -keyout /tmp/key.pem -out /tmp/cert.pem",
+      #   path    => [ "/bin/", "/sbin/" , "/usr/bin/", "/usr/sbin/" ],
+      #   creates => '/tmp/cert.pem',
+      # }
+
+      # java_ks { 'jira':
+      #   ensure      => present,
+      #   name        => 'jira',
+      #   certificate => '/tmp/cert.pem',
+      #   private_key => '/tmp/key.pem',
+      #   target      => '/tmp/jira.ks',
+      #   password    => 'changeit',
+      #   require     => Exec['tmpkey'],
+      # }
+
+      # # There is a bug in the check-java.sh that prevents jira from starting on Centos Stream 8
+      # # https://jira.atlassian.com/browse/JRASERVER-77097
+      # # Running with script_check_java_manage => true to solve this
+      # class { 'jira':
+      #   installdir               => '/opt/atlassian-jira',
+      #   homedir                  => '/opt/jira-home',
+      #   javahome                 => '/usr',
+      #   jvm_type                 => 'oracle-jdk-1.8',
+      #   db                       => 'mysql',
+      #   dbport                   => 3306,
+      #   dbdriver                 => 'com.mysql.jdbc.Driver',
+      #   dbtype                   => 'mysql',
+      #   tomcat_port              => 8081,
+      #   tomcat_native_ssl        => true,
+      #   tomcat_keystore_file     => '/tmp/jira.ks',
+      #   script_check_java_manage => true,
+      #   require                  => [Mysql::Db['jira'], Java_ks['jira']],
+      # }
     EOS
 
-    wget_cmd = 'wget -q --tries=24 --retry-connrefused --read-timeout=10 --no-check-certificate localhost:8081'
+    # wget_cmd = 'wget -q --tries=24 --retry-connrefused --read-timeout=10 --no-check-certificate localhost:8081'
     apply_manifest(pp, catch_failures: true)
-    sleep SLEEP_SECONDS
-    shell wget_cmd, acceptable_exit_codes: [0, 8]
-    sleep SLEEP_SECONDS
-    shell wget_cmd, acceptable_exit_codes: [0, 8]
+    # sleep SLEEP_SECONDS
+    # shell wget_cmd, acceptable_exit_codes: [0, 8]
+    # sleep SLEEP_SECONDS
+    # shell wget_cmd, acceptable_exit_codes: [0, 8]
 
-    apply_manifest(pp, catch_changes: true)
+    # apply_manifest(pp, catch_changes: true)
   end
 
   it 'errorlog' do
+    shell 'journalctl'
     shell 'cat /var/log/mysql/error.log'
   end
 
-  describe process('java') do
-    it { is_expected.to be_running }
-  end
-
-  describe port(8081) do
-    it { is_expected.to be_listening }
-  end
-
-  describe service('jira') do
-    it { is_expected.to be_enabled }
-    it { is_expected.to be_running }
-  end
-
-  describe user('jira') do
-    it { is_expected.to belong_to_group 'jira' }
-    it { is_expected.to have_login_shell '/bin/true' }
-  end
-
-  specify do
-    expect(command('wget -q --tries=24 --retry-connrefused --no-check-certificate --read-timeout=10 -O- localhost:8081')).
-      to have_attributes(stdout: %r{8.13.5})
-  end
-
-  specify do
-    expect(command('wget -q --tries=24 --retry-connrefused --no-check-certificate --read-timeout=10 -O- https://localhost:8443')).
-      to have_attributes(stdout: %r{8.13.5})
-  end
+  # describe process('java') do
+  #   it { is_expected.to be_running }
+  # end
+
+  # describe port(8081) do
+  #   it { is_expected.to be_listening }
+  # end
+
+  # describe service('jira') do
+  #   it { is_expected.to be_enabled }
+  #   it { is_expected.to be_running }
+  # end
+
+  # describe user('jira') do
+  #   it { is_expected.to belong_to_group 'jira' }
+  #   it { is_expected.to have_login_shell '/bin/true' }
+  # end
+
+  # specify do
+  #   expect(command('wget -q --tries=24 --retry-connrefused --no-check-certificate --read-timeout=10 -O- localhost:8081')).
+  #     to have_attributes(stdout: %r{8.13.5})
+  # end
+
+  # specify do
+  #   expect(command('wget -q --tries=24 --retry-connrefused --no-check-certificate --read-timeout=10 -O- https://localhost:8443')).
+  #     to have_attributes(stdout: %r{8.13.5})
+  # end
 
   describe 'shutdown' do
     it { shell('service jira stop', acceptable_exit_codes: [0, 1]) }