diff --git a/make/build-common.xml b/make/build-common.xml
index 4a04fda1ec..7ba8f74fc8 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -139,13 +139,13 @@
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
           <istrue value="${isLinuxX86}" /> <!-- no more supported since SWT 4.10 -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar">
           <istrue value="${isLinuxARM64}" /> <!-- FIXME JAU .. hack -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar">
           <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt.jar">
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt.jar">
           <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
         </condition>
         <property name="swt-cocoa-macosx-x86_64.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt.jar"/>
@@ -169,16 +169,16 @@
           </and>
         </condition>
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt.jar">
-          <istrue value="${isSolarisX86}" /> <!-- no more supported since SWT 4.10 -->
+          <istrue value="${isSolarisX86}" /> <!-- no more supported -->
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86/swt.jar">
-          <istrue value="${isSolarisAMD64}" /> <!-- FIXME JAU .. hack -->
+        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-x86_64/swt.jar">
+          <istrue value="${isSolarisAMD64}" /> <!-- no more supported -->
         </condition>
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt.jar">
-          <istrue value="${isSolarisSparc}" />
+          <istrue value="${isSolarisSparc}" /> <!-- no more supported -->
         </condition>
-		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparc/swt.jar">
-          <istrue value="${isSolarisSparcv9}" /> <!-- FIXME JAU .. hack -->
+		<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-solaris-sparcv9/swt.jar">
+          <istrue value="${isSolarisSparcv9}" /> <!-- no more supported -->
         </condition>
         <echo message="swt.jar=${swt.jar}" />
 
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index 223c08f5c9..52216502f3 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -27,8 +27,8 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
-#export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar
-export SWT_CLASSPATH=/usr/local/projects/JOGL/SWT/swt-4.3.0/gtk-linux-x86_64/swt-debug.jar
+export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar
+#export SWT_CLASSPATH=/usr/local/projects/JOGL/SWT/swt-4.3.0/gtk-linux-x86_64/swt-debug.jar
 
 . $SDIR/tests.sh  `which java` -d64 ../build-x86_64 $*
 
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 135257fa51..58142e1175 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -118,6 +118,7 @@ function jrun() {
     #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogl.glu.nojava=true"
 
     #D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
+    D_ARGS="-Dnativewindow.debug.SWT -Dnativewindow.debug.X11Util -Dnewt.debug.Window"
     #D_ARGS="-Dnativewindow.debug=all -Dnewt.debug.Window"
     #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all -Djogamp.debug.Lock"
 
@@ -145,7 +146,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.DebugGL"
     #D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.JAWT -Dnewt.debug.Window"
-    D_ARGS="-Dnativewindow.debug.SWT -Djogl.debug.GLCanvas"
+    #D_ARGS="-Dnativewindow.debug.SWT -Djogl.debug.GLCanvas"
     #D_ARGS="-Dnativewindow.debug.JAWT -Djogl.debug.GLCanvas"
     #D_ARGS="-Dnativewindow.debug.JAWT -Djogamp.debug.TaskBase.TraceSource"
     #D_ARGS="-Dnativewindow.debug.JAWT"
@@ -757,12 +758,12 @@ function testawtswt() {
 # SWT (testswt)
 #
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTEclipseGLCanvas01GLn $*
-testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $*
+#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $*
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestBug672NewtCanvasSWTSashForm $*
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestBug672NewtCanvasSWTSashFormComposite $*
 #testswt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2SWT3 $*
-#testswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $*
+testswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $*
 #testswt com.jogamp.opengl.test.junit.jogl.demos.es2.swt.TestGearsES2SWT $*
 
 #