diff --git a/java/client/test/org/openqa/selenium/AlertsTest.java b/java/client/test/org/openqa/selenium/AlertsTest.java
index 6850787924a6f..e59a16fe6af99 100644
--- a/java/client/test/org/openqa/selenium/AlertsTest.java
+++ b/java/client/test/org/openqa/selenium/AlertsTest.java
@@ -156,6 +156,7 @@ public void testShouldAllowAUserToDismissAPrompt() {
 
   @JavascriptEnabled
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/607")
   @NotYetImplemented(value = {HTMLUNIT},
     reason = "HtmlUnit: click()/prompt need to run in different threads")
   public void testShouldAllowAUserToSetTheValueOfAPrompt() {
@@ -307,6 +308,7 @@ public void testPromptShouldHaveNullValueIfDismissed() {
 
   @JavascriptEnabled
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/607")
   @NotYetImplemented(value = HTMLUNIT,
     reason = "HtmlUnit: click()/prompt need to run in different threads.")
   public void testHandlesTwoAlertsFromOneInteraction() {
diff --git a/java/client/test/org/openqa/selenium/ClickTest.java b/java/client/test/org/openqa/selenium/ClickTest.java
index aabf92f2d3635..3259cbafa612b 100644
--- a/java/client/test/org/openqa/selenium/ClickTest.java
+++ b/java/client/test/org/openqa/selenium/ClickTest.java
@@ -125,6 +125,7 @@ public void testJsLocatedElementsCanUpdateFramesIfFoundSomehowElse() {
 
   @JavascriptEnabled
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanClickOnAnElementWithTopSetToANegativeNumber() {
     String page = appServer.whereIs("styledPage.html");
     driver.get(page);
@@ -214,6 +215,7 @@ public void testCanClickOnALinkThatContainsTextWrappedInASpan() {
   }
 
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanClickOnALinkThatContainsEmbeddedBlockElements() {
     assumeFalse(
         "Fails on Android phones: https://code.google.com/p/chromedriver/issues/detail?id=1022",
diff --git a/java/client/test/org/openqa/selenium/ContentEditableTest.java b/java/client/test/org/openqa/selenium/ContentEditableTest.java
index 68318002e822c..b40c24a5fb331 100644
--- a/java/client/test/org/openqa/selenium/ContentEditableTest.java
+++ b/java/client/test/org/openqa/selenium/ContentEditableTest.java
@@ -88,6 +88,7 @@ public void testNonPrintableCharactersShouldWorkWithContentEditableOrDesignModeS
   @Test
   @Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldBeAbleToTypeIntoEmptyContentEditableElement() {
     driver.get(pages.readOnlyPage);
     WebElement editable = driver.findElement(By.id("content-editable-blank"));
@@ -117,6 +118,7 @@ public void testShouldBeAbleToTypeIntoContentEditableElementWithExistingValue()
   @Ignore(IE)
   @Ignore(value = SAFARI, reason = "cannot type on contentEditable with synthetic events, issue 3127")
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldBeAbleToTypeIntoTinyMCE() {
     driver.get(appServer.whereIs("tinymce.html"));
     driver.switchTo().frame("mce_0_ifr");
diff --git a/java/client/test/org/openqa/selenium/ElementAttributeTest.java b/java/client/test/org/openqa/selenium/ElementAttributeTest.java
index 57f81d5aed28c..adbb9abffb977 100644
--- a/java/client/test/org/openqa/selenium/ElementAttributeTest.java
+++ b/java/client/test/org/openqa/selenium/ElementAttributeTest.java
@@ -320,6 +320,7 @@ public void testGetAttributeDoesNotReturnAnObjectForSvgProperties() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanRetrieveTheCurrentValueOfATextFormField_textInput() {
     driver.get(pages.formPage);
     WebElement element = driver.findElement(By.id("working"));
@@ -330,6 +331,7 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_textInput() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanRetrieveTheCurrentValueOfATextFormField_emailInput() {
     driver.get(pages.formPage);
     WebElement element = driver.findElement(By.id("email"));
@@ -340,6 +342,7 @@ public void testCanRetrieveTheCurrentValueOfATextFormField_emailInput() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanRetrieveTheCurrentValueOfATextFormField_textArea() {
     driver.get(pages.formPage);
     WebElement element = driver.findElement(By.id("emptyTextArea"));
diff --git a/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java b/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java
index 23e5f574f1194..d32ff5931e018 100644
--- a/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java
+++ b/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java
@@ -262,6 +262,7 @@ public void shouldCatchErrorsWithMessageAndStacktraceWhenExecutingInitialScript(
 
   @JavascriptEnabled
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void shouldBeAbleToExecuteAsynchronousScripts() {
     driver.get(pages.ajaxyPage);
 
diff --git a/java/client/test/org/openqa/selenium/FormHandlingTest.java b/java/client/test/org/openqa/selenium/FormHandlingTest.java
index 76d744fb80f94..c09c9df72184d 100644
--- a/java/client/test/org/openqa/selenium/FormHandlingTest.java
+++ b/java/client/test/org/openqa/selenium/FormHandlingTest.java
@@ -103,6 +103,7 @@ public void testShouldNotBeAbleToSubmitAFormThatDoesNotExist() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() {
     driver.get(pages.javascriptPage);
     WebElement textarea = driver.findElement(By.id("keyUpArea"));
@@ -113,6 +114,7 @@ public void testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testSendKeysKeepsCapitalization() {
     driver.get(pages.javascriptPage);
     WebElement textarea = driver.findElement(By
@@ -134,6 +136,7 @@ public void testShouldSubmitAFormUsingTheNewlineLiteral() {
   }
 
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldSubmitAFormUsingTheEnterKey() {
     driver.get(pages.formPage);
     WebElement nestedForm = driver.findElement(By.id("nested_form"));
@@ -145,6 +148,7 @@ public void testShouldSubmitAFormUsingTheEnterKey() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldEnterDataIntoFormFields() {
     driver.get(pages.xhtmlTestPage);
     WebElement element = driver.findElement(By.xpath("//form[@name='someForm']/input[@id='username']"));
@@ -240,6 +244,7 @@ public void testSendingKeyboardEventsShouldAppendTextInInputs() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue() {
     driver.get(pages.formPage);
     WebElement element = driver.findElement(By.id("inputWithText"));
@@ -251,6 +256,7 @@ public void testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue()
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testSendingKeyboardEventsShouldAppendTextInTextAreas() {
     driver.get(pages.formPage);
     WebElement element = driver.findElement(By.id("withText"));
@@ -288,6 +294,7 @@ public void handleFormWithJavascriptAction() {
   @Test
   @Ignore(SAFARI)
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanClickOnASubmitButton() {
     checkSubmitButton("internal_explicit_submit");
   }
@@ -296,6 +303,7 @@ public void testCanClickOnASubmitButton() {
   @Test
   @Ignore(SAFARI)
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanClickOnASubmitButtonNestedSpan() {
     checkSubmitButton("internal_span_submit");
   }
@@ -303,6 +311,7 @@ public void testCanClickOnASubmitButtonNestedSpan() {
   @Test
   @Ignore(SAFARI)
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanClickOnAnImplicitSubmitButton() {
     assumeFalse(isIe6(driver) || isIe7(driver) );
     checkSubmitButton("internal_implicit_submit");
@@ -312,6 +321,7 @@ public void testCanClickOnAnImplicitSubmitButton() {
   @Ignore(IE)
   @Ignore(SAFARI)
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanClickOnAnExternalSubmitButton() {
     checkSubmitButton("external_explicit_submit");
   }
@@ -320,6 +330,7 @@ public void testCanClickOnAnExternalSubmitButton() {
   @Ignore(IE)
   @Ignore(SAFARI)
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testCanClickOnAnExternalImplicitSubmitButton() {
     checkSubmitButton("external_implicit_submit");
   }
diff --git a/java/client/test/org/openqa/selenium/FrameSwitchingTest.java b/java/client/test/org/openqa/selenium/FrameSwitchingTest.java
index 3162cddbe2678..03c59cadc0078 100644
--- a/java/client/test/org/openqa/selenium/FrameSwitchingTest.java
+++ b/java/client/test/org/openqa/selenium/FrameSwitchingTest.java
@@ -521,6 +521,7 @@ public void testJavaScriptShouldExecuteInTheContextOfTheCurrentFrame() {
 
   @JavascriptEnabled
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldNotSwitchMagicallyToTheTopWindow() {
     String baseUrl = appServer.whereIs("frame_switching_tests/");
     driver.get(baseUrl + "bug4876.html");
diff --git a/java/client/test/org/openqa/selenium/I18nTest.java b/java/client/test/org/openqa/selenium/I18nTest.java
index 66212263f4d5f..7a96d4e2b2d47 100644
--- a/java/client/test/org/openqa/selenium/I18nTest.java
+++ b/java/client/test/org/openqa/selenium/I18nTest.java
@@ -67,6 +67,7 @@ public void testCn() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testEnteringHebrewTextFromLeftToRight() {
     driver.get(pages.chinesePage);
     WebElement input = driver.findElement(By.name("i18n"));
@@ -78,6 +79,7 @@ public void testEnteringHebrewTextFromLeftToRight() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testEnteringHebrewTextFromRightToLeft() {
     driver.get(pages.chinesePage);
     WebElement input = driver.findElement(By.name("i18n"));
@@ -179,6 +181,7 @@ public void testShouldBeAbleToActivateIMEEngine() throws InterruptedException {
   @Ignore(CHROME)
   @Ignore(FIREFOX)
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldBeAbleToInputJapanese() {
     assumeTrue("IME is supported on Linux only.",
                TestUtilities.getEffectivePlatform().is(Platform.LINUX));
diff --git a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
index c1878260f42cd..ce982097f6ca5 100644
--- a/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
+++ b/java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
@@ -100,6 +100,7 @@ public void testShouldBeAbleToFindElementAfterJavascriptCausesANewPageToLoad() {
 
   @JavascriptEnabled
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldFireOnChangeEventWhenSettingAnElementsValue() {
     driver.get(pages.javascriptPage);
     driver.findElement(By.id("change")).sendKeys("foo");
@@ -174,6 +175,7 @@ public void testIfNoElementHasFocusTheActiveElementIsTheBody() {
   @JavascriptEnabled
   @Test
   @Ignore(value = SAFARI, reason = "issue 4061")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testChangeEventIsFiredAppropriatelyWhenFocusIsLost() {
     driver.get(pages.javascriptPage);
 
diff --git a/java/client/test/org/openqa/selenium/PageLoadingTest.java b/java/client/test/org/openqa/selenium/PageLoadingTest.java
index 186a2b8c37f62..2dd80fca3c65c 100644
--- a/java/client/test/org/openqa/selenium/PageLoadingTest.java
+++ b/java/client/test/org/openqa/selenium/PageLoadingTest.java
@@ -159,6 +159,7 @@ public void testEagerStrategyShouldNotWaitForResources() {
   @Ignore(CHROME)
   @Ignore(SAFARI)
   @Ignore(PHANTOMJS)
+  @Ignore(MARIONETTE)
   @NeedsLocalEnvironment
   public void testEagerStrategyShouldNotWaitForResourcesOnRefresh() {
     initLocalDriver("eager");
diff --git a/java/client/test/org/openqa/selenium/TextHandlingTest.java b/java/client/test/org/openqa/selenium/TextHandlingTest.java
index 193c554cf8a43..d1e89cd01fcc8 100644
--- a/java/client/test/org/openqa/selenium/TextHandlingTest.java
+++ b/java/client/test/org/openqa/selenium/TextHandlingTest.java
@@ -32,6 +32,7 @@
 import static org.openqa.selenium.testing.Driver.ALL;
 import static org.openqa.selenium.testing.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Driver.IE;
+import static org.openqa.selenium.testing.Driver.MARIONETTE;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -191,6 +192,7 @@ public void testShouldRetainTheFormatingOfTextWithinAPreElementThatIsWithinARegu
   @Test
   @Ignore(value = IE, reason = "IE: inserts \r\n instead of \n")
   @Ignore(HTMLUNIT)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() {
     driver.get(pages.formPage);
     WebElement textarea = driver.findElement(By.id("withText"));
@@ -208,6 +210,7 @@ public void testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea() {
 
   @Test
   @Ignore(value = HTMLUNIT, reason = "Possible bug in getAttribute?")
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testShouldBeAbleToEnterDatesAfterFillingInOtherValuesFirst() {
     driver.get(pages.formPage);
     WebElement input = driver.findElement(By.id("working"));
@@ -352,6 +355,7 @@ public void testTextOfATextAreaShouldBeEqualToItsDefaultText() {
 
   @Test
   @Ignore(IE)
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void testTextOfATextAreaShouldBeEqualToItsDefaultTextEvenAfterTyping() {
     driver.get(pages.formPage);
     WebElement area = driver.findElement(By.id("withText"));
diff --git a/java/client/test/org/openqa/selenium/TypingTest.java b/java/client/test/org/openqa/selenium/TypingTest.java
index 415aedf7ab718..cb896c7869e62 100644
--- a/java/client/test/org/openqa/selenium/TypingTest.java
+++ b/java/client/test/org/openqa/selenium/TypingTest.java
@@ -43,6 +43,7 @@
 import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.drivers.Browser;
 
+@Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
 public class TypingTest extends JUnit4TestBase {
 
   @JavascriptEnabled
diff --git a/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java b/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
index 9019df3f227eb..c687fe0c366de 100644
--- a/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
+++ b/java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
@@ -232,6 +232,7 @@ public void shouldGetMeaningfulExceptionOnBrowserDeath() throws Exception {
   @NeedsFreshDriver
   @NoDriverAfterTest
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void shouldWaitUntilBrowserHasClosedProperly() throws Exception {
     driver.get(pages.simpleTestPage);
     driver.quit();
@@ -345,6 +346,7 @@ public void shouldBeAbleToStartANewInstanceEvenWithVerboseLogging() {
   }
 
   @Test
+  @NotYetImplemented(value = MARIONETTE, reason = "/window/rect")
   public void shouldBeAbleToPassCommandLineOptions() {
     FirefoxBinary binary = new FirefoxBinary();
     binary.addCommandLineOptions("-width", "800", "-height", "600");
@@ -474,6 +476,7 @@ private static String randomString() {
   }
 
   @Test
+  @Ignore(value = MARIONETTE, issue = "https://github.com/mozilla/geckodriver/issues/594")
   public void multipleFirefoxDriversRunningConcurrently() throws Exception {
     int numThreads;
     if (!SauceDriver.shouldUseSauce()) {