diff -r 5dfedce8ce62 -r b1e90a8a876c test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
--- a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java	Tue Jun 26 09:52:21 2018 -0400
+++ b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java	Mon Jun 25 23:04:21 2018 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -36,8 +36,9 @@
 import jdk.test.lib.Utils;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
+ * @requires vm.hasSAandCanAttach
  * @library /test/lib
  * @run main/othervm TestClhsdbJstackLock
  */
@@ -145,11 +146,6 @@
 
         LingeredApp app = null;
 
-        if (!Platform.shouldSAAttach()) {
-            System.out.println("SA attach not expected to work - test skipped.");
-            return;
-        }
-
         try {
             List<String> vmArgs = new ArrayList<String>(Utils.getVmOptions());