diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingsTest.java
index 5c339b36bb..a3abaa485a 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingsTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingsTest.java
@@ -240,9 +240,9 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
 
 		//
 		// This test is verifying a hack that was put in to fix the difference in 'Alt' key handling
-		// on Windows (https://bugs.openjdk.java.net/browse/JDK-8194873).  
-		// Create an action and set the keybinding to use the 'Alt' modifier.  
-		// Verify that the action will also get mapped to the 'Alt Graph' modifier.  
+		// on Windows (https://bugs.openjdk.java.net/browse/JDK-8194873).
+		// Create an action and set the keybinding to use the 'Alt' modifier.
+		// Verify that the action will also get mapped to the 'Alt Graph' modifier.
 		//
 
 		// verify that no action is mapped to the new binding
@@ -335,14 +335,11 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
 		setUpDialog();
 		selectRowForAction(action1);
 
-		capture(panel, "pre.keystroke.change");
 		KeyStroke validKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_DOWN_MASK);
 		triggerActionKey(keyField, InputEvent.CTRL_DOWN_MASK, validKeyStroke.getKeyCode());
 		assertEquals(KeyEntryTextField.parseKeyStroke(validKeyStroke), keyField.getText());
-		capture(panel, "post.keystroke.change");
 
 		apply();
-		capture(panel, "post.keystroke.apply");
 		assertEquals(validKeyStroke, getKeyStroke(action1));
 
 		// try again to set a reserved binding
diff --git a/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java b/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java
index d148103b4b..32bd901970 100644
--- a/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java
+++ b/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java
@@ -1795,14 +1795,17 @@ public abstract class AbstractGenericTest extends AbstractGTest {
 
 		// ghidra.test.property.report.dir
 		// Possible Values:
-		// server:	     {share dir}/junits.new/JunitTest_version/reports
-		// local gradle: {user home}/git/{repo}/ghidra/build/JUnit/reports
-		// eclipse:      {module}/bin/
+		// server        {share dir}/reports/{type}/{branch}/{date}/
+		// local gradle: {repo}/Ghidra/{module}/build/JUnit/reports
+		// eclipse:      {repo}/Ghidra/{module}/bin/
 		// build:        unsupported
 
+		// we add to the above directory a single dir value of 'debug'
+
+		String debugDirName = "debug";
 		String dirPath = System.getProperty(GHIDRA_TEST_PROPERTY_REPORT_DIR);
 		if (dirPath != null) { // running from gradle
-			debugDirectory = new File(dirPath);
+			debugDirectory = new File(dirPath, debugDirName);
 		}
 		else { // running from Eclipse
 
@@ -1810,7 +1813,7 @@ public abstract class AbstractGenericTest extends AbstractGTest {
 			// reports, nor do we have a build directory.  'bin' is the closest thing to that.
 			ResourceFile moduleDir = Application.getMyModuleRootDirectory();
 			ResourceFile binDir = new ResourceFile(moduleDir, "bin");
-			debugDirectory = binDir.getFile(false);
+			debugDirectory = new File(binDir.getFile(false), debugDirName);
 		}
 
 		return debugDirectory;