diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php
index a395ad969..6d85cb325 100644
--- a/src/Composer/DependencyResolver/Solver.php
+++ b/src/Composer/DependencyResolver/Solver.php
@@ -304,7 +304,7 @@ class Solver
             // if ignoreinstalledsobsoletes is not set, we're also checking
             // obsoletes of installed packages (like newer rpm versions)
             //
-            /** @TODO: if ($this->noInstalledObsoletes) */
+            /** TODO if ($this->noInstalledObsoletes) */
             if (true) {
                 $noObsoletes = isset($this->noObsoletes[$package->getId()]);
                 $isInstalled = (isset($this->installedMap[$package->getId()]));
diff --git a/tests/Composer/Test/DependencyResolver/SolverTest.php b/tests/Composer/Test/DependencyResolver/SolverTest.php
index 5ad7e90c3..875dca41c 100644
--- a/tests/Composer/Test/DependencyResolver/SolverTest.php
+++ b/tests/Composer/Test/DependencyResolver/SolverTest.php
@@ -67,7 +67,7 @@ class SolverTest extends TestCase
             $this->markTestIncomplete('Reporting this failure is not implemented/working yet');
             //$this->fail('Unsolvable conflict did not resolve in exception.');
         } catch (SolverProblemsException $e) {
-            // @todo: assert problem properties
+            // TODO assert problem properties
         }
     }
 
@@ -519,7 +519,7 @@ class SolverTest extends TestCase
             $transaction = $this->solver->solve($this->request);
             $this->fail('Unsolvable conflict did not resolve in exception.');
         } catch (SolverProblemsException $e) {
-            // @todo: assert problem properties
+            // TODO assert problem properties
         }
     }
 
@@ -540,7 +540,7 @@ class SolverTest extends TestCase
             $transaction = $this->solver->solve($this->request);
             $this->fail('Unsolvable conflict did not resolve in exception.');
         } catch (SolverProblemsException $e) {
-            // @todo: assert problem properties
+            // TODO assert problem properties
         }
     }