--- old/test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java	2017-11-22 07:26:10.000000000 -0800
+++ new/test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java	2017-11-22 07:26:09.000000000 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,6 +118,15 @@
 
         exceptions = false;
         try {
+            int km = tk.getMenuShortcutKeyMaskEx();
+        } catch (HeadlessException e) {
+            exceptions = true;
+        }
+        if (!exceptions)
+            throw new RuntimeException("HeadlessException did not occur when expected");
+
+        exceptions = false;
+        try {
             boolean state = tk.getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
         } catch (HeadlessException e) {
             exceptions = true;