diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java b/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
index 34bc6efe6cbbbabea3e612cbff59b18bfa9678b6..23c66c2dbddd6cd4fbd025009f5272262e1ec9eb 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
@@ -24,6 +24,9 @@ int passid;
 int get_pass_id(This *this){
 return this->passid;
 }
+int com_amd_aparapi_test_CallObjectStatic$Dummy__foo(){
+   return(42);
+}
 __kernel void run(
 __global int *out, 
 int passid
@@ -33,7 +36,7 @@ This* this=&thisStruct;
 this->out = out;
 this->passid = passid;
 {
-this->out[0] = foo();
+this->out[0]  = com_amd_aparapi_test_CallObjectStatic$Dummy__foo();
 return;
 }
 }
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java b/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6fcac034d95efb833ec354723c5d15b08a8b131
--- /dev/null
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
@@ -0,0 +1,53 @@
+package com.amd.aparapi.test;
+
+import com.amd.aparapi.Kernel;
+
+
+class AnotherClass{
+   static public int foo() {
+      return 42;
+   }
+};
+
+public class CallStaticInAnotherClass extends Kernel{
+
+   public int doodoo() {
+      return AnotherClass.foo();
+   }
+
+   public void run() {
+      out[0] = AnotherClass.foo() + doodoo();
+   }
+
+   int out[] = new int[2];
+}
+
+/**{OpenCL{
+typedef struct This_s{
+   __global int *out;
+   int passid;
+}This;
+int get_pass_id(This *this){
+   return this->passid;
+}
+int com_amd_aparapi_test_AnotherClass__foo(){
+   return(42);
+}
+int com_amd_aparapi_test_CallStaticInAnotherClass__doodoo(This *this){
+   return(com_amd_aparapi_test_AnotherClass__foo());
+}
+__kernel void run(
+   __global int *out, 
+   int passid
+){
+   This thisStruct;
+   This* this=&thisStruct;
+   this->out = out;
+   this->passid = passid;
+   {
+      this->out[0]  = com_amd_aparapi_test_AnotherClass__foo() + com_amd_aparapi_test_CallStaticInAnotherClass__doodoo(this);
+      return;
+   }
+}
+
+}OpenCL}**/