diff --git a/neon/tests/install/core.pm b/neon/tests/install/core.pm
index 2723e51..abee78d 100644
--- a/neon/tests/install/core.pm
+++ b/neon/tests/install/core.pm
@@ -1,97 +1,101 @@
 # Copyright (C) 2017 Harald Sitter <sitter@kde.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 # published by the Free Software Foundation; either version 2 of
 # the License or (at your option) version 3 or any later version
 # accepted by the membership of KDE e.V. (or its successor approved
 # by the membership of KDE e.V.), which shall act as a proxy
 # defined in Section 14 of version 3 of the license.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use base "basetest";
 use testapi;
 
 # Core test to run for all install cases. Asserts common stuff.
 sub run {
     my $user = $testapi::username;
     my $password = $testapi::password;
     $testapi::username = 'neon';
     $testapi::password = '';
 
     # We better be at the desktop now.
     assert_screen 'live-desktop', 360;
 
     select_console 'log-console';
     {
         upload_logs '/cdrom/.disk/info', log_name => 'metadata';
         upload_logs '/cdrom/casper/filesystem.manifest', log_name => 'metadata';
 
         assert_script_run 'wget ' . data_url('permissions_check.rb'),  16;
         assert_script_run 'ruby permissions_check.rb', 16;
 
         if (get_var('SECUREBOOT')) {
             assert_script_sudo 'apt install -y mokutil', 60;
             assert_script_sudo 'mokutil --sb-state', 16;
             assert_screen 'mokutil-sb-on';
         }
 
         if (get_var('OPENQA_APT_UPGRADE')) {
+            if (get_var('OPENQA_INSTALLATION_OFFLINE')) {
+                die 'You cannot upgrade on an offline test!!!'
+            }
+
             assert_script_sudo 'apt update',  2 * 60;
             my $pkgs = get_var('OPENQA_APT_UPGRADE');
             if ($pkgs eq "") {
                 $pkgs = "dist-upgrade";
             } else {
                 $pkgs = "install " . $pkgs;
             }
             assert_script_sudo 'DEBIAN_FRONTEND=noninteractive apt -y ' . $pkgs, 30 * 60;
         }
 
         # Disable networking during installation to ensure network-less
         # installation works as expected.
         if (get_var('OPENQA_INSTALLATION_OFFLINE')) {
             assert_script_sudo 'nmcli networking off';
         }
 
         # TODO: maybe control via env var?
         # assert_script_run 'wget ' . data_url('enable_qdebug.rb'),  16;
         # assert_script_run 'ruby enable_qdebug.rb', 16;
     }
     select_console 'x11';
 
     # Leave system as we have found it.
     assert_screen 'live-desktop', 5 * 60;
 
     if (get_var('OPENQA_INSTALLATION_OFFLINE')) {
         assert_screen 'plasma-nm-offline';
     }
 
     $testapi::username = $user;
     $testapi::password = $password;
 }
 
 sub post_fail_hook {
     select_console 'log-console';
 
     # Uploads end up in wok/ulogs/
     upload_logs '/home/neon/.xsession-errors';
     script_sudo 'journalctl --no-pager -b 0 > /tmp/journal.txt';
     upload_logs '/tmp/journal.txt';
 }
 
 sub test_flags {
     # without anything - rollback to 'lastgood' snapshot if failed
     # 'fatal' - whole test suite is in danger if this fails
     # 'milestone' - after this test succeeds, update 'lastgood'
     # 'important' - if this fails, set the overall state to 'fail'
     return { fatal => 1 };
 }
 
 1;