diff --git a/.clang-tidy b/.clang-tidy
index 0bdce212ec5..a61302773ae 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -32,7 +32,6 @@ Checks: |
    readability-redundant-control-flow,
    readability-simplify-boolean-expr,
    readability-simplify-subscript-expr,
-   readability-static-accessed-through-instance,
    readability-static-definition-in-anonymous-namespace,
    readability-string-compare,
    readability-uniqueptr-delete-release,
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f92958dfbfd..d3d912cdcb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -275,9 +275,9 @@ tutorials-samples-no-gpu:
 empty:
   <<: *global_job_definition
   stage: build
-  image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:cuda-9.0
+  image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/clang-python3:6.0
   script:
-    - export myconfig=empty
+    - export myconfig=empty with_static_analysis=true
     - bash maintainer/CI/build_cmake.sh
   tags:
     - docker
diff --git a/src/core/constraints/ShapeBasedConstraint.cpp b/src/core/constraints/ShapeBasedConstraint.cpp
index ae78e1f6fd0..cc7b479aabe 100644
--- a/src/core/constraints/ShapeBasedConstraint.cpp
+++ b/src/core/constraints/ShapeBasedConstraint.cpp
@@ -70,25 +70,24 @@ ParticleForce ShapeBasedConstraint::force(Particle const &p,
 
     if (dist > 0) {
       outer_normal_vec = -dist_vec / dist;
-      auto const dist2 = dist * dist;
       force1 = calc_non_bonded_pair_force(p, part_rep, ia_params, dist_vec,
                                           dist, &torque1, &torque2);
 #ifdef DPD
       if (thermo_switch & THERMO_DPD) {
-        force1 += dpd_pair_force(p, part_rep, ia_params, dist_vec, dist, dist2);
+        force1 +=
+            dpd_pair_force(p, part_rep, ia_params, dist_vec, dist, dist * dist);
         // Additional use of DPD here requires counter increase
         dpd_rng_counter_increment();
       }
 #endif
     } else if (m_penetrable && (dist <= 0)) {
       if ((!m_only_positive) && (dist < 0)) {
-        auto const dist2 = dist * dist;
         force1 = calc_non_bonded_pair_force(p, part_rep, ia_params, dist_vec,
                                             -dist, &torque1, &torque2);
 #ifdef DPD
         if (thermo_switch & THERMO_DPD) {
-          force1 +=
-              dpd_pair_force(p, part_rep, ia_params, dist_vec, dist, dist2);
+          force1 += dpd_pair_force(p, part_rep, ia_params, dist_vec, dist,
+                                   dist * dist);
           // Additional use of DPD here requires counter increase
           dpd_rng_counter_increment();
         }
diff --git a/src/core/observables/Current.hpp b/src/core/observables/Current.hpp
index ffb288b7018..355d7da1268 100644
--- a/src/core/observables/Current.hpp
+++ b/src/core/observables/Current.hpp
@@ -31,14 +31,14 @@ class Current : public PidObservable {
   int n_values() const override { return 3; };
   std::vector<double> evaluate(PartCfg &partCfg) const override {
     std::vector<double> res(n_values());
-    for (int i : ids()) {
 #ifdef ELECTROSTATICS
+    for (int i : ids()) {
       double charge = partCfg[i].p.q;
       res[0] += charge * partCfg[i].m.v[0];
       res[1] += charge * partCfg[i].m.v[1];
       res[2] += charge * partCfg[i].m.v[2];
-#endif
     };
+#endif
     return res;
   };
 };
diff --git a/src/core/observables/DipoleMoment.hpp b/src/core/observables/DipoleMoment.hpp
index ea298a1fe29..94d78f4b523 100644
--- a/src/core/observables/DipoleMoment.hpp
+++ b/src/core/observables/DipoleMoment.hpp
@@ -31,15 +31,15 @@ class DipoleMoment : public PidObservable {
   int n_values() const override { return 3; };
   std::vector<double> evaluate(PartCfg &partCfg) const override {
     std::vector<double> res(n_values(), 0.0);
-    for (int i : ids()) {
 #ifdef ELECTROSTATICS
+    for (int i : ids()) {
       double charge = partCfg[i].p.q;
 
       res[0] += charge * partCfg[i].r.p[0];
       res[1] += charge * partCfg[i].r.p[1];
       res[2] += charge * partCfg[i].r.p[2];
-#endif // ELECTROSTATICS
     }
+#endif // ELECTROSTATICS
     return res;
   }
 };
diff --git a/src/core/observables/MagneticDipoleMoment.hpp b/src/core/observables/MagneticDipoleMoment.hpp
index 6ae0f750f96..2bae92ba4e4 100644
--- a/src/core/observables/MagneticDipoleMoment.hpp
+++ b/src/core/observables/MagneticDipoleMoment.hpp
@@ -31,13 +31,13 @@ class MagneticDipoleMoment : public PidObservable {
   int n_values() const override { return 3; };
   std::vector<double> evaluate(PartCfg &partCfg) const override {
     std::vector<double> res(n_values(), 0.0);
-    for (int i : ids()) {
 #ifdef DIPOLES
+    for (int i : ids()) {
       res[0] += partCfg[i].calc_dip()[0];
       res[1] += partCfg[i].calc_dip()[1];
       res[2] += partCfg[i].calc_dip()[2];
-#endif
     }
+#endif
     return res;
   }
 };