diff --git a/system/base/glibc/actions.py b/system/base/glibc/actions.py
index d04cf6e7..69e4c100 100644
--- a/system/base/glibc/actions.py
+++ b/system/base/glibc/actions.py
@@ -93,8 +93,11 @@ def build():
 
 def check():
      shelltools.cd("build")
-     autotools.make("check || true")
 
+     if get.buildTYPE() != "emul32":
+        autotools.make("check || true")
+     else:
+        pass
 
 def install():
     shelltools.cd("build")
diff --git a/system/base/glibc/pspec.xml b/system/base/glibc/pspec.xml
index 77264e60..4994404c 100644
--- a/system/base/glibc/pspec.xml
+++ b/system/base/glibc/pspec.xml
@@ -80,9 +80,11 @@
         <PartOf>system.base</PartOf>
         <Summary>32-bit shared libraries for glibc</Summary>
         <BuildType>emul32</BuildType>
+        <BuildDependencies>
+            <Dependency>glibc-32bit</Dependency><!-- cyclic dep? -->
+        </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">glibc</Dependency>
-            <Dependency>glibc-32bit</Dependency><!-- cyclic dep? -->
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/ld.so.conf.d/60-glibc-32bit.conf</Path>