diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index e6a7f6683f1ae..42629f6ab42a7 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -156,7 +156,6 @@ java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java 8159451 macosx-all
 java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java 6986109 generic-all
 java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java 6986109 windows-all
 java/awt/Mixing/AWT_Mixing/MixingPanelsResizing.java 8049405 macosx-all
-java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java 8049405 macosx-all
 java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java 8049405 macosx-all
 java/awt/Mixing/NonOpaqueInternalFrame.java 7124549 macosx-all
 java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8298823 macosx-all
diff --git a/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java b/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java
index eebf4e2e24f9e..b3ac6e7564540 100644
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/OverlappingTestBase.java
@@ -378,7 +378,8 @@ protected void clickAndBlink(Robot robot, Point lLoc) {
     protected String failMessage = "The LW component did not received the click.";
 
     private static boolean isValidForPixelCheck(Component component) {
-        if ((component instanceof java.awt.Scrollbar) || isMac && (component instanceof java.awt.Button)) {
+        if (component == null ||
+                (component instanceof java.awt.Scrollbar) || isMac && (component instanceof java.awt.Button)) {
             return false;
         }
         return true;